diff --git a/doc/CREDITS b/doc/CREDITS
index 381925766..d32dd7966 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -22,7 +22,7 @@ More special thanks to:
     Kevin did the Apple 2 port and found at least one serious error in the
     C library while doing so.
 
-  * Christian Groessler <cpg@aladdin.de>
+  * Christian Groessler <chris@groessler.org>
     Mark Keates <Mark.Keates@dendrite.com>
     Freddy Offenga <taf_offenga@yahoo.com>
     David Lloyd <dmlloyd@atari-central.com>
diff --git a/doc/atari.sgml b/doc/atari.sgml
index 411b0299e..0505d7063 100644
--- a/doc/atari.sgml
+++ b/doc/atari.sgml
@@ -6,7 +6,7 @@
 <author>Shawn Jefferson, <htmlurl
 url="mailto:shawnjefferson@24fightingchickens.com"
 name="shawnjefferson@24fightingchickens.com"> and
-Christian Groessler, <htmlurl url="mailto:cpg@aladdin.de" name="cpg@aladdin.de">
+Christian Groessler, <htmlurl url="mailto:chris@groessler.org" name="chris@groessler.org">
 <date>03-Jan-2006
 
 <abstract>
diff --git a/doc/dio.sgml b/doc/dio.sgml
index 685e3454f..c3fff366f 100644
--- a/doc/dio.sgml
+++ b/doc/dio.sgml
@@ -2,7 +2,7 @@
 
 <article>
 <title>Diskette Sector I/O Routines
-<author>Christian Groessler, <htmlurl url="mailto:cpg@aladdin.de" name="cpg@aladdin.de">
+<author>Christian Groessler, <htmlurl url="mailto:chris@groessler.org" name="chris@groessler.org">
 <date>20-Feb-2005
 
 <abstract>
diff --git a/include/atari.h b/include/atari.h
index eb105d655..fe6265e36 100644
--- a/include/atari.h
+++ b/include/atari.h
@@ -8,7 +8,7 @@
 /*                                                                           */
 /* (C) 2000-2006 Mark Keates <markk@dendrite.co.uk>                          */
 /*               Freddy Offenga <taf_offenga@yahoo.com>                      */
-/*               Christian Groessler <cpg@aladdin.de>                        */
+/*               Christian Groessler <chris@groessler.org>                   */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
diff --git a/include/dio.h b/include/dio.h
index dabc71913..45d196341 100644
--- a/include/dio.h
+++ b/include/dio.h
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2005 Christian Groessler <cpg@aladdin.de>                             */
+/* (C) 2005 Christian Groessler <chris@groessler.org>                        */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
diff --git a/testcode/lib/atari/ostype.c b/testcode/lib/atari/ostype.c
index a3569ec3d..e97bd00e6 100644
--- a/testcode/lib/atari/ostype.c
+++ b/testcode/lib/atari/ostype.c
@@ -1,7 +1,7 @@
 /*
  * testprogram for get_ostype() and get_tv() functions
  *
- * 09-Jul-2004, cpg@aladdin.de
+ * 09-Jul-2004, chris@groessler.org
  */
 
 #include <stdio.h>