diff --git a/pep-0218.txt b/pep-0218.txt
index 6151823a8..b12d4e0ca 100644
--- a/pep-0218.txt
+++ b/pep-0218.txt
@@ -2,7 +2,7 @@ PEP: 218
 Title: Adding a Built-In Set Object Type
 Version: $Revision$
 Last-Modified: $Date$
-Author: gvwilson at ddj.com (Greg Wilson), python at rcn.com (Raymond Hettinger)
+Author: gvwilson@ddj.com (Greg Wilson), python@rcn.com (Raymond Hettinger)
 Status: Final
 Type: Standards Track
 Created: 31-Jul-2000
diff --git a/pep-0289.txt b/pep-0289.txt
index 1dcac0aa0..4ef99615e 100644
--- a/pep-0289.txt
+++ b/pep-0289.txt
@@ -2,7 +2,7 @@ PEP: 289
 Title: Generator Expressions
 Version: $Revision$
 Last-Modified: $Date$
-Author: python at rcn.com (Raymond D. Hettinger)
+Author: python@rcn.com (Raymond D. Hettinger)
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst
diff --git a/pep-0315.txt b/pep-0315.txt
index d8808acf8..df95ed0ab 100644
--- a/pep-0315.txt
+++ b/pep-0315.txt
@@ -2,8 +2,8 @@ PEP: 315
 Title: Enhanced While Loop
 Version: $Revision$
 Last-Modified: $Date$
-Author: W Isaac Carroll <icarroll at pobox.com>
-        Raymond Hettinger <python at rcn.com>
+Author: W Isaac Carroll <icarroll@pobox.com>
+        Raymond Hettinger <python@rcn.com>
 Status: Deferred
 Type: Standards Track
 Content-Type: text/plain
diff --git a/pep-0329.txt b/pep-0329.txt
index 38c699340..e6eb77d61 100644
--- a/pep-0329.txt
+++ b/pep-0329.txt
@@ -2,7 +2,7 @@ PEP: 329
 Title: Treating Builtins as Constants in the Standard Library
 Version: $Revision$
 Last-Modified: $Date$
-Author: Raymond Hettinger <python at rcn.com>
+Author: Raymond Hettinger <python@rcn.com>
 Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
diff --git a/pep-3101.txt b/pep-3101.txt
index 29d873117..e8e61d4f7 100644
--- a/pep-3101.txt
+++ b/pep-3101.txt
@@ -2,7 +2,7 @@ PEP: 3101
 Title: Advanced String Formatting
 Version: $Revision$
 Last-Modified: $Date$
-Author: Talin <talin at acm.org>
+Author: Talin <talin@acm.org>
 Status: Draft
 Type: Standards Track
 Content-Type: text/plain
diff --git a/pep-3102.txt b/pep-3102.txt
index f1f5dd9ae..eb1975340 100644
--- a/pep-3102.txt
+++ b/pep-3102.txt
@@ -2,7 +2,7 @@ PEP: 3102
 Title: Keyword-Only Arguments
 Version: $Revision$
 Last-Modified: $Date$
-Author: Talin <talin at acm.org>
+Author: Talin <talin@acm.org>
 Status: Accepted
 Type: Standards Track
 Content-Type: text/plain
diff --git a/pep-3115.txt b/pep-3115.txt
index 8b89b4302..fefb074d9 100644
--- a/pep-3115.txt
+++ b/pep-3115.txt
@@ -2,7 +2,7 @@ PEP: 3115
 Title: Metaclasses in Python 3000
 Version: $Revision$
 Last-Modified: $Date$
-Author: Talin <talin at acm.org>
+Author: Talin <talin@acm.org>
 Status: Accepted
 Type: Standards Track
 Content-Type: text/plain
diff --git a/pep-3126.txt b/pep-3126.txt
index aab4765de..a08f3a0bb 100644
--- a/pep-3126.txt
+++ b/pep-3126.txt
@@ -3,7 +3,7 @@ Title: Remove Implicit String Concatenation
 Version: $Revision$
 Last-Modified: $Date$
 Author: Jim J. Jewett <JimJJewett@gmail.com>,
-        Raymond D. Hettinger <python at rcn.com>
+        Raymond D. Hettinger <python@rcn.com>
 Status: Rejected
 Type: Standards Track
 Content-Type: text/x-rst
diff --git a/pep-3129.txt b/pep-3129.txt
index 0e32005b8..da80168be 100644
--- a/pep-3129.txt
+++ b/pep-3129.txt
@@ -2,7 +2,7 @@ PEP: 3129
 Title: Class Decorators
 Version: $Revision$
 Last-Modified: $Date$
-Author: Collin Winter <collinw at gmail.com>
+Author: Collin Winter <collinw@gmail.com>
 Status: Final
 Type: Standards Track
 Content-Type: text/x-rst