diff --git a/Pandoc.cabal.in b/Pandoc.cabal.in
index 7e6dec0cf..8db5ef6b9 100644
--- a/Pandoc.cabal.in
+++ b/Pandoc.cabal.in
@@ -2,7 +2,7 @@ Name:            Pandoc
 Version:         @VERSION@
 License:         GPL
 License-File:    COPYING
-Author:          John MacFarlane <jgm@berkeley.edu>
+Author:          John MacFarlane <jgm at berkeley dot edu>
 Homepage:        http://sophos.berkeley.edu/macfarlane/pandoc
 Category:        Text
 Synopsis:        Utilities for translating between various markup formats    
diff --git a/README b/README
index d651e1a0a..88cc77d8f 100644
--- a/README
+++ b/README
@@ -24,10 +24,10 @@ or output format requires only adding a reader or writer.
 [RTF]:  http://en.wikipedia.org/wiki/Rich_Text_Format
 [Haskell]:  http://www.haskell.org/
 
-(c) 2006 John MacFarlane (jgm At berkeley.edu). Released under the
+(c) 2006 John MacFarlane (jgm at berkeley dot edu). Released under the
 [GPL], version 2 or greater.  This software carries no warranty of
 any kind.  (See COPYRIGHT for full copyright and warranty notices.)
-Recai Oktaş (roktas At debian.org) deserves credit for the build
+Recai Oktaş (roktas at debian dot org) deserves credit for the build
 system, the debian package, and the robust wrapper scripts.
 
 [GPL]: http://www.gnu.org/copyleft/gpl.html
diff --git a/debian/copyright b/debian/copyright
index 974162c6b..f40c35c40 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Pandoc
-Copyright (C) 2006 John MacFarlane <jgm@berkeley.edu>
+Copyright (C) 2006 John MacFarlane <jgm at berkeley dot edu>
 
 This code is released under the [GPL], version 2 or later: