diff --git a/actions/all.php b/actions/all.php
index e56e10c21f..5ffc7e9bd1 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -18,15 +18,15 @@
  * 
  * @category Actions
  * @package  Actions
- * @author   Evan Prodromou <evan@prodromou.name>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Adrian Lang <mail@adrianlang.de>
  * @author   Meitar Moscovitz <meitarm@gmail.com>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@controlyourself.ca>
diff --git a/actions/api.php b/actions/api.php
index 9b5f548074..06fdbfb44c 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -18,8 +18,8 @@
  * 
  * @category Actions
  * @package  Actions
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Evan Prodromou <evan@prodromou.name>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Brenda Wallace <shiny@cpan.org>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Robin Millette <millette@controlyourself.ca>
@@ -27,7 +27,7 @@
  * @author   Christopher Vollick <psycotica0@gmail.com>
  * @author   CiaranG <ciaran@ciarang.com>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Gina Haeussge <osd@foosel.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 44abbfceb7..5f6807d10a 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/omb.php';
  *
  * @category Action
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 7f7dd75fef..d9cc7f7f3c 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
  *
  * @category Action
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
diff --git a/index.php b/index.php
index a1d983dce7..4e6c093792 100644
--- a/index.php
+++ b/index.php
@@ -23,9 +23,9 @@
  * @author Christopher Vollick <psycotica0@gmail.com> 
  * @author CiaranG <ciaran@ciarang.com>
  * @author Craig Andrews <candrews@integralblue.com> 
- * @author Evan Prodromou <evan@controlezvous.ca>
- * @author Evan Prodromou <evan@controlyourself.ca> 
- * @author Evan Prodromou <evan@prodromou.name>
+ * @author Evan Prodromou <evan@status.net>
+ * @author Evan Prodromou <evan@status.net> 
+ * @author Evan Prodromou <evan@status.net>
  * @author Evan Prodromou <evan@status.net>
  * @author Gina Haeussge <osd@foosel.net> 
  * @author Jeffery To <jeffery.to@gmail.com>
diff --git a/install.php b/install.php
index 54ae0cd5e1..24ad3eb246 100644
--- a/install.php
+++ b/install.php
@@ -26,7 +26,7 @@
  * @author   CiaranG <ciaran@ciarang.com>
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Eric Helgeson <helfire@Erics-MBP.local>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
diff --git a/lib/httpclient.php b/lib/httpclient.php
index 9b0bb6f3a5..0059711534 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -21,7 +21,7 @@
  *
  * @category  Action
  * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -40,7 +40,7 @@ if (!defined('STATUSNET')) {
  *
  * @category HTTP
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  */
@@ -61,7 +61,7 @@ class HTTPResponse
  *
  * @category HTTP
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  */