diff --git a/COPYING b/COPYING
index aaccd3ae..26370e93 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+Copyright (C) 2008 John Paulett (john -at- paulett.org)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/jsonpickle/__init__.py b/jsonpickle/__init__.py
index 725b85ca..bbbd0ca9 100644
--- a/jsonpickle/__init__.py
+++ b/jsonpickle/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/jsonpickle/pickler.py b/jsonpickle/pickler.py
index 9c145c50..a653b79d 100644
--- a/jsonpickle/pickler.py
+++ b/jsonpickle/pickler.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/jsonpickle/unpickler.py b/jsonpickle/unpickler.py
index 618d38d5..a4bd6270 100644
--- a/jsonpickle/unpickler.py
+++ b/jsonpickle/unpickler.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/jsonpickle/util.py b/jsonpickle/util.py
index b4b191e2..a734091f 100644
--- a/jsonpickle/util.py
+++ b/jsonpickle/util.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/setup.py b/setup.py
index fc1f1c06..886b1e02 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -29,7 +29,7 @@
                 "arbitrary object graph into JSON",
     long_description = _jsonpickle.__doc__,
     author="John Paulett",
-    author_email="john@7oars.com",
+    author_email="john -at- paulett.org",
     url="http://code.google.com/p/jsonpickle/",
     license="BSD",
     platforms=['POSIX', 'Windows'],
diff --git a/tests/benchmark.py b/tests/benchmark.py
index 8fb6a734..6a4f8eaf 100755
--- a/tests/benchmark.py
+++ b/tests/benchmark.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/jsonpickle_test.py b/tests/jsonpickle_test.py
index 1830153c..c32ff5e8 100644
--- a/tests/jsonpickle_test.py
+++ b/tests/jsonpickle_test.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/runtests.py b/tests/runtests.py
index 60b9cd87..4b294ec2 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/samples.py b/tests/samples.py
index c9ab8c13..a75ea82c 100644
--- a/tests/samples.py
+++ b/tests/samples.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/thirdparty_tests.py b/tests/thirdparty_tests.py
index 18bbd0ef..a8287272 100644
--- a/tests/thirdparty_tests.py
+++ b/tests/thirdparty_tests.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/util_tests.py b/tests/util_tests.py
index 0f67eb92..9ba43385 100644
--- a/tests/util_tests.py
+++ b/tests/util_tests.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008 John Paulett (john -at- 7oars.com)
+# Copyright (C) 2008 John Paulett (john -at- paulett.org)
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which