Updated the source with the correct e-mail address

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40253
diff --git a/src/SDL.c b/src/SDL.c
index 6327796..6fe1799 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/SDL_error.c b/src/SDL_error.c
index 908a057..29369c7 100644
--- a/src/SDL_error.c
+++ b/src/SDL_error.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/SDL_error_c.h b/src/SDL_error_c.h
index 61125ed..68b6815 100644
--- a/src/SDL_error_c.h
+++ b/src/SDL_error_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/SDL_fatal.c b/src/SDL_fatal.c
index 59a9dd6..9a689f4 100644
--- a/src/SDL_fatal.c
+++ b/src/SDL_fatal.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/SDL_fatal.h b/src/SDL_fatal.h
index 3b85db9..7cfc8f5 100644
--- a/src/SDL_fatal.h
+++ b/src/SDL_fatal.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/SDL_getenv.c b/src/SDL_getenv.c
index 612c49b..0cb46ef 100644
--- a/src/SDL_getenv.c
+++ b/src/SDL_getenv.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index a1e96fe..12fd1d8 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_audio_c.h b/src/audio/SDL_audio_c.h
index 1d7de00..42dd393 100644
--- a/src/audio/SDL_audio_c.h
+++ b/src/audio/SDL_audio_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_audiocvt.c b/src/audio/SDL_audiocvt.c
index d624a10..45c8cdd 100644
--- a/src/audio/SDL_audiocvt.c
+++ b/src/audio/SDL_audiocvt.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_audiodev.c b/src/audio/SDL_audiodev.c
index 47e2582..2970fa7 100644
--- a/src/audio/SDL_audiodev.c
+++ b/src/audio/SDL_audiodev.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_audiodev_c.h b/src/audio/SDL_audiodev_c.h
index 3d10565..9a50b39 100644
--- a/src/audio/SDL_audiodev_c.h
+++ b/src/audio/SDL_audiodev_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_audiomem.c b/src/audio/SDL_audiomem.c
index 4ca7169..232e895 100644
--- a/src/audio/SDL_audiomem.c
+++ b/src/audio/SDL_audiomem.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_audiomem.h b/src/audio/SDL_audiomem.h
index a67698a..73c513e 100644
--- a/src/audio/SDL_audiomem.h
+++ b/src/audio/SDL_audiomem.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_mixer.c b/src/audio/SDL_mixer.c
index 27f9384..e8c7d8a 100644
--- a/src/audio/SDL_mixer.c
+++ b/src/audio/SDL_mixer.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h
index 3cb43a1..154d4f5 100644
--- a/src/audio/SDL_sysaudio.h
+++ b/src/audio/SDL_sysaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index bf46422..513ae6a 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/SDL_wave.h b/src/audio/SDL_wave.h
index 147535c..4500f36 100644
--- a/src/audio/SDL_wave.h
+++ b/src/audio/SDL_wave.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c
index d58a98c..3de6f05 100644
--- a/src/audio/alsa/SDL_alsa_audio.c
+++ b/src/audio/alsa/SDL_alsa_audio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 
diff --git a/src/audio/alsa/SDL_alsa_audio.h b/src/audio/alsa/SDL_alsa_audio.h
index 657fea7..aaad7e0 100644
--- a/src/audio/alsa/SDL_alsa_audio.h
+++ b/src/audio/alsa/SDL_alsa_audio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifndef _ALSA_PCM_audio_h
diff --git a/src/audio/amigaos/SDL_ahiaudio.c b/src/audio/amigaos/SDL_ahiaudio.c
index d79fdb3..c369cda 100644
--- a/src/audio/amigaos/SDL_ahiaudio.c
+++ b/src/audio/amigaos/SDL_ahiaudio.c
@@ -19,7 +19,7 @@
     Sam Lantinga
     5635-34 Springhouse Dr.
     Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/amigaos/SDL_ahiaudio.h b/src/audio/amigaos/SDL_ahiaudio.h
index 3c73fa2..8ccd539 100644
--- a/src/audio/amigaos/SDL_ahiaudio.h
+++ b/src/audio/amigaos/SDL_ahiaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c
index 92904af..c2da607 100644
--- a/src/audio/arts/SDL_artsaudio.c
+++ b/src/audio/arts/SDL_artsaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/arts/SDL_artsaudio.h b/src/audio/arts/SDL_artsaudio.h
index 19e35e0..83ff3a3 100644
--- a/src/audio/arts/SDL_artsaudio.h
+++ b/src/audio/arts/SDL_artsaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc
index 08c3437..25649a2 100644
--- a/src/audio/baudio/SDL_beaudio.cc
+++ b/src/audio/baudio/SDL_beaudio.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/baudio/SDL_beaudio.h b/src/audio/baudio/SDL_beaudio.h
index 97a85ea..3d6125f 100644
--- a/src/audio/baudio/SDL_beaudio.h
+++ b/src/audio/baudio/SDL_beaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c
index 9f5d9dc..c8b3c5d 100644
--- a/src/audio/disk/SDL_diskaudio.c
+++ b/src/audio/disk/SDL_diskaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 
     This file hacked^H^H^H^H^H^Hwritten by Ryan C. Gordon
         (icculus@linuxgames.com)
diff --git a/src/audio/disk/SDL_diskaudio.h b/src/audio/disk/SDL_diskaudio.h
index 0046f0b..4928a19 100644
--- a/src/audio/disk/SDL_diskaudio.h
+++ b/src/audio/disk/SDL_diskaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/dma/SDL_dmaaudio.c b/src/audio/dma/SDL_dmaaudio.c
index dcee605..98b6ad2 100644
--- a/src/audio/dma/SDL_dmaaudio.c
+++ b/src/audio/dma/SDL_dmaaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/dma/SDL_dmaaudio.h b/src/audio/dma/SDL_dmaaudio.h
index e17524c..a8458b6 100644
--- a/src/audio/dma/SDL_dmaaudio.h
+++ b/src/audio/dma/SDL_dmaaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/dmedia/SDL_irixaudio.c b/src/audio/dmedia/SDL_irixaudio.c
index 20a4bd61..8dd0c4d 100644
--- a/src/audio/dmedia/SDL_irixaudio.c
+++ b/src/audio/dmedia/SDL_irixaudio.c
@@ -19,7 +19,7 @@
     Sam Lantinga
     5635-34 Springhouse Dr.
     Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/dmedia/SDL_irixaudio.h b/src/audio/dmedia/SDL_irixaudio.h
index 9f09559..524dc64 100644
--- a/src/audio/dmedia/SDL_irixaudio.h
+++ b/src/audio/dmedia/SDL_irixaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c
index eecb2c6..051cfd3 100644
--- a/src/audio/dsp/SDL_dspaudio.c
+++ b/src/audio/dsp/SDL_dspaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/dsp/SDL_dspaudio.h b/src/audio/dsp/SDL_dspaudio.h
index 4929c21..52fa583 100644
--- a/src/audio/dsp/SDL_dspaudio.h
+++ b/src/audio/dsp/SDL_dspaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c
index cee85f8..294bb55 100644
--- a/src/audio/esd/SDL_esdaudio.c
+++ b/src/audio/esd/SDL_esdaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/esd/SDL_esdaudio.h b/src/audio/esd/SDL_esdaudio.h
index 15fb0a0..e92c3b6 100644
--- a/src/audio/esd/SDL_esdaudio.h
+++ b/src/audio/esd/SDL_esdaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/macrom/SDL_romaudio.c b/src/audio/macrom/SDL_romaudio.c
index 065a489..9abed34 100644
--- a/src/audio/macrom/SDL_romaudio.c
+++ b/src/audio/macrom/SDL_romaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/macrom/SDL_romaudio.h b/src/audio/macrom/SDL_romaudio.h
index 74aa193..f35b092 100644
--- a/src/audio/macrom/SDL_romaudio.h
+++ b/src/audio/macrom/SDL_romaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/nas/SDL_nasaudio.c b/src/audio/nas/SDL_nasaudio.c
index ef236fa..e644b59 100644
--- a/src/audio/nas/SDL_nasaudio.c
+++ b/src/audio/nas/SDL_nasaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 
     This driver was written by:
     Erik Inge Bolsø
diff --git a/src/audio/nas/SDL_nasaudio.h b/src/audio/nas/SDL_nasaudio.h
index 3b2fdbf..39c817d 100644
--- a/src/audio/nas/SDL_nasaudio.h
+++ b/src/audio/nas/SDL_nasaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 
     This driver was written by:
     Erik Inge Bolsø
diff --git a/src/audio/nto/SDL_nto_audio.c b/src/audio/nto/SDL_nto_audio.c
index eeb4fb5..8f5fdc5 100644
--- a/src/audio/nto/SDL_nto_audio.c
+++ b/src/audio/nto/SDL_nto_audio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 
diff --git a/src/audio/nto/SDL_nto_audio.h b/src/audio/nto/SDL_nto_audio.h
index dd85af4..79d1115 100644
--- a/src/audio/nto/SDL_nto_audio.h
+++ b/src/audio/nto/SDL_nto_audio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifndef _NTO_PCM_audio_h
diff --git a/src/audio/openbsd/SDL_openbsdaudio.c b/src/audio/openbsd/SDL_openbsdaudio.c
index 594dd60..8b48c76 100644
--- a/src/audio/openbsd/SDL_openbsdaudio.c
+++ b/src/audio/openbsd/SDL_openbsdaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/audio/openbsd/SDL_openbsdaudio.h b/src/audio/openbsd/SDL_openbsdaudio.h
index 4798ecb..d02e886 100644
--- a/src/audio/openbsd/SDL_openbsdaudio.h
+++ b/src/audio/openbsd/SDL_openbsdaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifndef _SDL_openbsdaudio_h
diff --git a/src/audio/paudio/SDL_paudio.h b/src/audio/paudio/SDL_paudio.h
index ab4f4ff..e30f166 100644
--- a/src/audio/paudio/SDL_paudio.h
+++ b/src/audio/paudio/SDL_paudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/sun/SDL_sunaudio.c b/src/audio/sun/SDL_sunaudio.c
index b67137a..2076f6c 100644
--- a/src/audio/sun/SDL_sunaudio.c
+++ b/src/audio/sun/SDL_sunaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/sun/SDL_sunaudio.h b/src/audio/sun/SDL_sunaudio.h
index 8b895d1..aef2bc8 100644
--- a/src/audio/sun/SDL_sunaudio.h
+++ b/src/audio/sun/SDL_sunaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/windib/SDL_dibaudio.c b/src/audio/windib/SDL_dibaudio.c
index 7ab1f00..84f1a56 100644
--- a/src/audio/windib/SDL_dibaudio.c
+++ b/src/audio/windib/SDL_dibaudio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/windib/SDL_dibaudio.h b/src/audio/windib/SDL_dibaudio.h
index 20ae6c1..eec15f1 100644
--- a/src/audio/windib/SDL_dibaudio.h
+++ b/src/audio/windib/SDL_dibaudio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/windx5/SDL_dx5audio.c b/src/audio/windx5/SDL_dx5audio.c
index 1356a40..d519f29 100644
--- a/src/audio/windx5/SDL_dx5audio.c
+++ b/src/audio/windx5/SDL_dx5audio.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/audio/windx5/SDL_dx5audio.h b/src/audio/windx5/SDL_dx5audio.h
index 4d21174..361b16a 100644
--- a/src/audio/windx5/SDL_dx5audio.h
+++ b/src/audio/windx5/SDL_dx5audio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/SDL_cdrom.c b/src/cdrom/SDL_cdrom.c
index 3a71ff5..260000d 100644
--- a/src/cdrom/SDL_cdrom.c
+++ b/src/cdrom/SDL_cdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/SDL_syscdrom.h b/src/cdrom/SDL_syscdrom.h
index 7beecf4..42bdb9d 100644
--- a/src/cdrom/SDL_syscdrom.h
+++ b/src/cdrom/SDL_syscdrom.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/beos/SDL_syscdrom.cc b/src/cdrom/beos/SDL_syscdrom.cc
index beb231f..3b3ca41 100644
--- a/src/cdrom/beos/SDL_syscdrom.cc
+++ b/src/cdrom/beos/SDL_syscdrom.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/bsdi/SDL_syscdrom.c b/src/cdrom/bsdi/SDL_syscdrom.c
index 32cf288..94f435a 100644
--- a/src/cdrom/bsdi/SDL_syscdrom.c
+++ b/src/cdrom/bsdi/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/dummy/SDL_syscdrom.c b/src/cdrom/dummy/SDL_syscdrom.c
index aabed72..a376a92 100644
--- a/src/cdrom/dummy/SDL_syscdrom.c
+++ b/src/cdrom/dummy/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/freebsd/SDL_syscdrom.c b/src/cdrom/freebsd/SDL_syscdrom.c
index 925f40c..01533b2 100644
--- a/src/cdrom/freebsd/SDL_syscdrom.c
+++ b/src/cdrom/freebsd/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/linux/SDL_syscdrom.c b/src/cdrom/linux/SDL_syscdrom.c
index 51b3a4c..7271928 100644
--- a/src/cdrom/linux/SDL_syscdrom.c
+++ b/src/cdrom/linux/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/macos/SDL_syscdrom.c b/src/cdrom/macos/SDL_syscdrom.c
index 2c67831..9ae8293 100644
--- a/src/cdrom/macos/SDL_syscdrom.c
+++ b/src/cdrom/macos/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/macos/SDL_syscdrom_c.h b/src/cdrom/macos/SDL_syscdrom_c.h
index 3751a33..29d6fee 100644
--- a/src/cdrom/macos/SDL_syscdrom_c.h
+++ b/src/cdrom/macos/SDL_syscdrom_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* This is the MacOS specific header for the SDL CD-ROM API
diff --git a/src/cdrom/openbsd/SDL_syscdrom.c b/src/cdrom/openbsd/SDL_syscdrom.c
index 071b27a..56a7e25 100644
--- a/src/cdrom/openbsd/SDL_syscdrom.c
+++ b/src/cdrom/openbsd/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/qnx/SDL_syscdrom.c b/src/cdrom/qnx/SDL_syscdrom.c
index 65ea535..6a0e60f 100644
--- a/src/cdrom/qnx/SDL_syscdrom.c
+++ b/src/cdrom/qnx/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/cdrom/win32/SDL_syscdrom.c b/src/cdrom/win32/SDL_syscdrom.c
index 929e421..912790b 100644
--- a/src/cdrom/win32/SDL_syscdrom.c
+++ b/src/cdrom/win32/SDL_syscdrom.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/endian/SDL_endian.c b/src/endian/SDL_endian.c
index 0fdf56d..f1671b4 100644
--- a/src/endian/SDL_endian.c
+++ b/src/endian/SDL_endian.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_active.c b/src/events/SDL_active.c
index 1fcfefb..2e59cf1 100644
--- a/src/events/SDL_active.c
+++ b/src/events/SDL_active.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index f472fcc..40b5e38 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_events_c.h b/src/events/SDL_events_c.h
index 2bc1168..d3ec07e 100644
--- a/src/events/SDL_events_c.h
+++ b/src/events/SDL_events_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_expose.c b/src/events/SDL_expose.c
index 7a107ea..03bb004 100644
--- a/src/events/SDL_expose.c
+++ b/src/events/SDL_expose.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
index f1220cc..1841085 100644
--- a/src/events/SDL_keyboard.c
+++ b/src/events/SDL_keyboard.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index fa5fbe7..9954fc6 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_quit.c b/src/events/SDL_quit.c
index 4a7684a..23ac61b 100644
--- a/src/events/SDL_quit.c
+++ b/src/events/SDL_quit.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_resize.c b/src/events/SDL_resize.c
index 6acea69..a079be3 100644
--- a/src/events/SDL_resize.c
+++ b/src/events/SDL_resize.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/events/SDL_sysevents.h b/src/events/SDL_sysevents.h
index 720b23f..e1ea255 100644
--- a/src/events/SDL_sysevents.h
+++ b/src/events/SDL_sysevents.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c
index 81f0906..adadf30 100644
--- a/src/file/SDL_rwops.c
+++ b/src/file/SDL_rwops.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 92660a1..ee151cc 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/SDL_joystick_c.h b/src/joystick/SDL_joystick_c.h
index 6e3721d..f71d3c9 100644
--- a/src/joystick/SDL_joystick_c.h
+++ b/src/joystick/SDL_joystick_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
index 099265c..c4bb52a 100644
--- a/src/joystick/SDL_sysjoystick.h
+++ b/src/joystick/SDL_sysjoystick.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/amigaos/SDL_sysjoystick.c b/src/joystick/amigaos/SDL_sysjoystick.c
index dc7b9ea..94a011b 100644
--- a/src/joystick/amigaos/SDL_sysjoystick.c
+++ b/src/joystick/amigaos/SDL_sysjoystick.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 
diff --git a/src/joystick/beos/SDL_bejoystick.cc b/src/joystick/beos/SDL_bejoystick.cc
index 2b46156..ed7b12a 100644
--- a/src/joystick/beos/SDL_bejoystick.cc
+++ b/src/joystick/beos/SDL_bejoystick.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index aedcb34..5b73987 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 /* SDL joystick driver for Darwin / MacOS X, based on the IOKit HID API */
diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c
index 40493b8..5eaca21 100644
--- a/src/joystick/dummy/SDL_sysjoystick.c
+++ b/src/joystick/dummy/SDL_sysjoystick.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index 0958be9..0bd5cfa 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/macos/SDL_sysjoystick.c b/src/joystick/macos/SDL_sysjoystick.c
index baef6ec..6ed4f0e 100644
--- a/src/joystick/macos/SDL_sysjoystick.c
+++ b/src/joystick/macos/SDL_sysjoystick.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/joystick/win32/SDL_mmjoystick.c b/src/joystick/win32/SDL_mmjoystick.c
index e897148..92761db 100644
--- a/src/joystick/win32/SDL_mmjoystick.c
+++ b/src/joystick/win32/SDL_mmjoystick.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/main/beos/SDL_BeApp.cc b/src/main/beos/SDL_BeApp.cc
index e9e9c08..2ec2714 100644
--- a/src/main/beos/SDL_BeApp.cc
+++ b/src/main/beos/SDL_BeApp.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/main/beos/SDL_BeApp.h b/src/main/beos/SDL_BeApp.h
index c804d3c..1071fcf 100644
--- a/src/main/beos/SDL_BeApp.h
+++ b/src/main/beos/SDL_BeApp.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/main/epoc/SDL_main.cpp b/src/main/epoc/SDL_main.cpp
index 73ebf22..d91427e 100644
--- a/src/main/epoc/SDL_main.cpp
+++ b/src/main/epoc/SDL_main.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/main/macos/SDL_main.c b/src/main/macos/SDL_main.c
index 3bca731..e251121 100644
--- a/src/main/macos/SDL_main.c
+++ b/src/main/macos/SDL_main.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/SDL_systhread.h b/src/thread/SDL_systhread.h
index 578bcbb..bbeb68b 100644
--- a/src/thread/SDL_systhread.h
+++ b/src/thread/SDL_systhread.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c
index 1b85514..a760e6e 100644
--- a/src/thread/SDL_thread.c
+++ b/src/thread/SDL_thread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/SDL_thread_c.h b/src/thread/SDL_thread_c.h
index 3023fa0..1d486fe 100644
--- a/src/thread/SDL_thread_c.h
+++ b/src/thread/SDL_thread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/amigaos/SDL_syssem.c b/src/thread/amigaos/SDL_syssem.c
index 51fd167..8b9c3f8 100644
--- a/src/thread/amigaos/SDL_syssem.c
+++ b/src/thread/amigaos/SDL_syssem.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/amigaos/SDL_systhread.c b/src/thread/amigaos/SDL_systhread.c
index 2755728..61d314e 100644
--- a/src/thread/amigaos/SDL_systhread.c
+++ b/src/thread/amigaos/SDL_systhread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/amigaos/SDL_systhread_c.h b/src/thread/amigaos/SDL_systhread_c.h
index 868c855..79ff18a 100644
--- a/src/thread/amigaos/SDL_systhread_c.h
+++ b/src/thread/amigaos/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/amigaos/SDL_thread.c b/src/thread/amigaos/SDL_thread.c
index 8810ae7..bd40020 100644
--- a/src/thread/amigaos/SDL_thread.c
+++ b/src/thread/amigaos/SDL_thread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/beos/SDL_syssem.c b/src/thread/beos/SDL_syssem.c
index 31896d5..79c72e9 100644
--- a/src/thread/beos/SDL_syssem.c
+++ b/src/thread/beos/SDL_syssem.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/beos/SDL_systhread.c b/src/thread/beos/SDL_systhread.c
index 59d509d..57ccf78 100644
--- a/src/thread/beos/SDL_systhread.c
+++ b/src/thread/beos/SDL_systhread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/beos/SDL_systhread_c.h b/src/thread/beos/SDL_systhread_c.h
index 3e4699f..33b5f04 100644
--- a/src/thread/beos/SDL_systhread_c.h
+++ b/src/thread/beos/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/epoc/SDL_sysmutex.cpp b/src/thread/epoc/SDL_sysmutex.cpp
index cd8178f..87a8e89 100644
--- a/src/thread/epoc/SDL_sysmutex.cpp
+++ b/src/thread/epoc/SDL_sysmutex.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/thread/epoc/SDL_syssem.cpp b/src/thread/epoc/SDL_syssem.cpp
index 8375b8a..461f48d 100644
--- a/src/thread/epoc/SDL_syssem.cpp
+++ b/src/thread/epoc/SDL_syssem.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/thread/epoc/SDL_systhread.cpp b/src/thread/epoc/SDL_systhread.cpp
index bc51197..640382c 100644
--- a/src/thread/epoc/SDL_systhread.cpp
+++ b/src/thread/epoc/SDL_systhread.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/thread/epoc/SDL_systhread_c.h b/src/thread/epoc/SDL_systhread_c.h
index be8b164..c466ec3 100644
--- a/src/thread/epoc/SDL_systhread_c.h
+++ b/src/thread/epoc/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/thread/generic/SDL_syscond.c b/src/thread/generic/SDL_syscond.c
index 42c8a59..61369e7 100644
--- a/src/thread/generic/SDL_syscond.c
+++ b/src/thread/generic/SDL_syscond.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/generic/SDL_syscond_c.h b/src/thread/generic/SDL_syscond_c.h
index 16ab5de..184ff0b 100644
--- a/src/thread/generic/SDL_syscond_c.h
+++ b/src/thread/generic/SDL_syscond_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/generic/SDL_sysmutex.c b/src/thread/generic/SDL_sysmutex.c
index 804d055..bf99665 100644
--- a/src/thread/generic/SDL_sysmutex.c
+++ b/src/thread/generic/SDL_sysmutex.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/generic/SDL_sysmutex_c.h b/src/thread/generic/SDL_sysmutex_c.h
index 16ab5de..184ff0b 100644
--- a/src/thread/generic/SDL_sysmutex_c.h
+++ b/src/thread/generic/SDL_sysmutex_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/generic/SDL_syssem.c b/src/thread/generic/SDL_syssem.c
index 2218ad6..63c5078 100644
--- a/src/thread/generic/SDL_syssem.c
+++ b/src/thread/generic/SDL_syssem.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/generic/SDL_syssem_c.h b/src/thread/generic/SDL_syssem_c.h
index 16ab5de..184ff0b 100644
--- a/src/thread/generic/SDL_syssem_c.h
+++ b/src/thread/generic/SDL_syssem_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/generic/SDL_systhread.c b/src/thread/generic/SDL_systhread.c
index 08b32c8..9fb3a48 100644
--- a/src/thread/generic/SDL_systhread.c
+++ b/src/thread/generic/SDL_systhread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/generic/SDL_systhread_c.h b/src/thread/generic/SDL_systhread_c.h
index c6fe446..b1f918d 100644
--- a/src/thread/generic/SDL_systhread_c.h
+++ b/src/thread/generic/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* Stub until we implement threads on this platform */
diff --git a/src/thread/irix/SDL_systhread.c b/src/thread/irix/SDL_systhread.c
index ee82dda..80b244a 100644
--- a/src/thread/irix/SDL_systhread.c
+++ b/src/thread/irix/SDL_systhread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/irix/SDL_systhread_c.h b/src/thread/irix/SDL_systhread_c.h
index 383ebf1..365f9b3 100644
--- a/src/thread/irix/SDL_systhread_c.h
+++ b/src/thread/irix/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #include <sys/types.h>
diff --git a/src/thread/linux/SDL_syscond.c b/src/thread/linux/SDL_syscond.c
index 36efa0b..f6c048a 100644
--- a/src/thread/linux/SDL_syscond.c
+++ b/src/thread/linux/SDL_syscond.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/linux/SDL_sysmutex.c b/src/thread/linux/SDL_sysmutex.c
index c8003af..464e4c8 100644
--- a/src/thread/linux/SDL_sysmutex.c
+++ b/src/thread/linux/SDL_sysmutex.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/linux/SDL_sysmutex_c.h b/src/thread/linux/SDL_sysmutex_c.h
index 47852b7..e72fcd2 100644
--- a/src/thread/linux/SDL_sysmutex_c.h
+++ b/src/thread/linux/SDL_sysmutex_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/linux/SDL_syssem.c b/src/thread/linux/SDL_syssem.c
index aa29033..77d6d53 100644
--- a/src/thread/linux/SDL_syssem.c
+++ b/src/thread/linux/SDL_syssem.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/linux/SDL_systhread.c b/src/thread/linux/SDL_systhread.c
index e24b755..5067963 100644
--- a/src/thread/linux/SDL_systhread.c
+++ b/src/thread/linux/SDL_systhread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/linux/SDL_systhread_c.h b/src/thread/linux/SDL_systhread_c.h
index 33268da..59a1b14 100644
--- a/src/thread/linux/SDL_systhread_c.h
+++ b/src/thread/linux/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SDL_USE_PTHREADS
diff --git a/src/thread/pth/SDL_systhread.c b/src/thread/pth/SDL_systhread.c
index 7b13da4..26a9d59 100644
--- a/src/thread/pth/SDL_systhread.c
+++ b/src/thread/pth/SDL_systhread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/pth/SDL_systhread_c.h b/src/thread/pth/SDL_systhread_c.h
index a8be3d9..d1430c5 100644
--- a/src/thread/pth/SDL_systhread_c.h
+++ b/src/thread/pth/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #include <pth.h>
diff --git a/src/thread/win32/SDL_sysmutex.c b/src/thread/win32/SDL_sysmutex.c
index 358821b..e28eaed 100644
--- a/src/thread/win32/SDL_sysmutex.c
+++ b/src/thread/win32/SDL_sysmutex.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/win32/SDL_syssem.c b/src/thread/win32/SDL_syssem.c
index c38e22e..cf5ebe9 100644
--- a/src/thread/win32/SDL_syssem.c
+++ b/src/thread/win32/SDL_syssem.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/win32/SDL_systhread.c b/src/thread/win32/SDL_systhread.c
index 26780f9..682ed18 100644
--- a/src/thread/win32/SDL_systhread.c
+++ b/src/thread/win32/SDL_systhread.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/thread/win32/SDL_systhread_c.h b/src/thread/win32/SDL_systhread_c.h
index cd823e3..154b982 100644
--- a/src/thread/win32/SDL_systhread_c.h
+++ b/src/thread/win32/SDL_systhread_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #include <windows.h>
diff --git a/src/timer/SDL_systimer.h b/src/timer/SDL_systimer.h
index 8b55d49..13e6e7c 100644
--- a/src/timer/SDL_systimer.h
+++ b/src/timer/SDL_systimer.h
@@ -19,7 +19,7 @@
     Sam Lantinga
     5635-34 Springhouse Dr.
     Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/SDL_timer.c b/src/timer/SDL_timer.c
index 978804d..10748e2 100644
--- a/src/timer/SDL_timer.c
+++ b/src/timer/SDL_timer.c
@@ -19,7 +19,7 @@
     Sam Lantinga
     5635-34 Springhouse Dr.
     Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/SDL_timer_c.h b/src/timer/SDL_timer_c.h
index d0e952e..f52516f 100644
--- a/src/timer/SDL_timer_c.h
+++ b/src/timer/SDL_timer_c.h
@@ -19,7 +19,7 @@
     Sam Lantinga
     5635-34 Springhouse Dr.
     Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/amigaos/SDL_systimer.c b/src/timer/amigaos/SDL_systimer.c
index de06a9a..26f62fe 100644
--- a/src/timer/amigaos/SDL_systimer.c
+++ b/src/timer/amigaos/SDL_systimer.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/beos/SDL_systimer.c b/src/timer/beos/SDL_systimer.c
index a44466b..2af1243 100644
--- a/src/timer/beos/SDL_systimer.c
+++ b/src/timer/beos/SDL_systimer.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/epoc/SDL_systimer.cpp b/src/timer/epoc/SDL_systimer.cpp
index 83ac859..4d11d91 100644
--- a/src/timer/epoc/SDL_systimer.cpp
+++ b/src/timer/epoc/SDL_systimer.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/timer/linux/SDL_systimer.c b/src/timer/linux/SDL_systimer.c
index 3646d3e..594a00f 100644
--- a/src/timer/linux/SDL_systimer.c
+++ b/src/timer/linux/SDL_systimer.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/macos/SDL_MPWtimer.c b/src/timer/macos/SDL_MPWtimer.c
index 8e7e357..0a2e8ec 100644
--- a/src/timer/macos/SDL_MPWtimer.c
+++ b/src/timer/macos/SDL_MPWtimer.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/macos/SDL_systimer.c b/src/timer/macos/SDL_systimer.c
index 6d4ab12..74609db 100644
--- a/src/timer/macos/SDL_systimer.c
+++ b/src/timer/macos/SDL_systimer.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/timer/win32/SDL_systimer.c b/src/timer/win32/SDL_systimer.c
index ff2a856..6862494 100644
--- a/src/timer/win32/SDL_systimer.c
+++ b/src/timer/win32/SDL_systimer.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c
index 462fcc2..2232fed 100644
--- a/src/video/SDL_RLEaccel.c
+++ b/src/video/SDL_RLEaccel.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_RLEaccel_c.h b/src/video/SDL_RLEaccel_c.h
index fbd7e39..ca00e8b 100644
--- a/src/video/SDL_RLEaccel_c.h
+++ b/src/video/SDL_RLEaccel_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_blit.c b/src/video/SDL_blit.c
index 1d529dc..93bb45e 100644
--- a/src/video/SDL_blit.c
+++ b/src/video/SDL_blit.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_blit.h b/src/video/SDL_blit.h
index 35de070..4c68a97 100644
--- a/src/video/SDL_blit.h
+++ b/src/video/SDL_blit.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_blit_0.c b/src/video/SDL_blit_0.c
index 3faa898..c1bbe4e 100644
--- a/src/video/SDL_blit_0.c
+++ b/src/video/SDL_blit_0.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_blit_1.c b/src/video/SDL_blit_1.c
index ace7db8..e1c3285 100644
--- a/src/video/SDL_blit_1.c
+++ b/src/video/SDL_blit_1.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index 8acbc6a..02ceabe 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
index 57acace..870c062 100644
--- a/src/video/SDL_blit_N.c
+++ b/src/video/SDL_blit_N.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index 81b7bc7..5f24edc 100644
--- a/src/video/SDL_bmp.c
+++ b/src/video/SDL_bmp.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_cursor.c b/src/video/SDL_cursor.c
index 7fe6bf6..e497330 100644
--- a/src/video/SDL_cursor.c
+++ b/src/video/SDL_cursor.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_cursor_c.h b/src/video/SDL_cursor_c.h
index a9c33ea..c325b96 100644
--- a/src/video/SDL_cursor_c.h
+++ b/src/video/SDL_cursor_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_gamma.c b/src/video/SDL_gamma.c
index f195cf7..2c2e1ae 100644
--- a/src/video/SDL_gamma.c
+++ b/src/video/SDL_gamma.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_leaks.h b/src/video/SDL_leaks.h
index 53dbfef..1b08953 100644
--- a/src/video/SDL_leaks.h
+++ b/src/video/SDL_leaks.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_memops.h b/src/video/SDL_memops.h
index e129df4..c5dad8d 100644
--- a/src/video/SDL_memops.h
+++ b/src/video/SDL_memops.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c
index 9625adc..e8c32ce 100644
--- a/src/video/SDL_pixels.c
+++ b/src/video/SDL_pixels.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_pixels_c.h b/src/video/SDL_pixels_c.h
index 3c0fc15..854843c 100644
--- a/src/video/SDL_pixels_c.h
+++ b/src/video/SDL_pixels_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c
index 6290d29..8e67ce3 100644
--- a/src/video/SDL_stretch.c
+++ b/src/video/SDL_stretch.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_stretch_c.h b/src/video/SDL_stretch_c.h
index 41ed2c4..76400f8 100644
--- a/src/video/SDL_stretch_c.h
+++ b/src/video/SDL_stretch_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index 46f8e6d..414be1d 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
index c55a52f..e118fe0 100644
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index b8ef36a..4160024 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_yuv.c b/src/video/SDL_yuv.c
index 7a2fb25..5dcc1c5 100644
--- a/src/video/SDL_yuv.c
+++ b/src/video/SDL_yuv.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_yuv_mmx.c b/src/video/SDL_yuv_mmx.c
index 9858c9e..0bca66c 100644
--- a/src/video/SDL_yuv_mmx.c
+++ b/src/video/SDL_yuv_mmx.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c
index 4e08c7f..fca24e1 100644
--- a/src/video/SDL_yuv_sw.c
+++ b/src/video/SDL_yuv_sw.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_yuv_sw_c.h b/src/video/SDL_yuv_sw_c.h
index 599bcd5..44b0e49 100644
--- a/src/video/SDL_yuv_sw_c.h
+++ b/src/video/SDL_yuv_sw_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/SDL_yuvfuncs.h b/src/video/SDL_yuvfuncs.h
index d5fe80f..b78df4d 100644
--- a/src/video/SDL_yuvfuncs.h
+++ b/src/video/SDL_yuvfuncs.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/aalib/SDL_aaevents.c b/src/video/aalib/SDL_aaevents.c
index 246b74d..4523426 100644
--- a/src/video/aalib/SDL_aaevents.c
+++ b/src/video/aalib/SDL_aaevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/aalib/SDL_aaevents_c.h b/src/video/aalib/SDL_aaevents_c.h
index 4b2acc3..1c583c9 100644
--- a/src/video/aalib/SDL_aaevents_c.h
+++ b/src/video/aalib/SDL_aaevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/aalib/SDL_aamouse.c b/src/video/aalib/SDL_aamouse.c
index ad2156c..528ee5c 100644
--- a/src/video/aalib/SDL_aamouse.c
+++ b/src/video/aalib/SDL_aamouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/aalib/SDL_aamouse_c.h b/src/video/aalib/SDL_aamouse_c.h
index c20ce28..3ffb922 100644
--- a/src/video/aalib/SDL_aamouse_c.h
+++ b/src/video/aalib/SDL_aamouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/aalib/SDL_aavideo.c b/src/video/aalib/SDL_aavideo.c
index 6e50db1..d94da93 100644
--- a/src/video/aalib/SDL_aavideo.c
+++ b/src/video/aalib/SDL_aavideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/aalib/SDL_aavideo.h b/src/video/aalib/SDL_aavideo.h
index 3412797..6770a68 100644
--- a/src/video/aalib/SDL_aavideo.h
+++ b/src/video/aalib/SDL_aavideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/blank_cursor.h b/src/video/blank_cursor.h
index 3af53cb..15b4276 100644
--- a/src/video/blank_cursor.h
+++ b/src/video/blank_cursor.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_BView.h b/src/video/bwindow/SDL_BView.h
index c7938fd..f10935c 100644
--- a/src/video/bwindow/SDL_BView.h
+++ b/src/video/bwindow/SDL_BView.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_BWin.h b/src/video/bwindow/SDL_BWin.h
index 91f2f0b..9db125e 100644
--- a/src/video/bwindow/SDL_BWin.h
+++ b/src/video/bwindow/SDL_BWin.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_lowvideo.h b/src/video/bwindow/SDL_lowvideo.h
index 69e95c0..bec51f9 100644
--- a/src/video/bwindow/SDL_lowvideo.h
+++ b/src/video/bwindow/SDL_lowvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_sysevents.cc b/src/video/bwindow/SDL_sysevents.cc
index ea2c6a9..e6bc659 100644
--- a/src/video/bwindow/SDL_sysevents.cc
+++ b/src/video/bwindow/SDL_sysevents.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_sysevents_c.h b/src/video/bwindow/SDL_sysevents_c.h
index d330b4f..98f2442 100644
--- a/src/video/bwindow/SDL_sysevents_c.h
+++ b/src/video/bwindow/SDL_sysevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_sysmouse.cc b/src/video/bwindow/SDL_sysmouse.cc
index dc1ec17..6f181e6 100644
--- a/src/video/bwindow/SDL_sysmouse.cc
+++ b/src/video/bwindow/SDL_sysmouse.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_sysmouse_c.h b/src/video/bwindow/SDL_sysmouse_c.h
index ffd3117..07f73d6 100644
--- a/src/video/bwindow/SDL_sysmouse_c.h
+++ b/src/video/bwindow/SDL_sysmouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
index 362c6f1..0cbcd81 100644
--- a/src/video/bwindow/SDL_sysvideo.cc
+++ b/src/video/bwindow/SDL_sysvideo.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_syswm.cc b/src/video/bwindow/SDL_syswm.cc
index 37d9644..4ed8718 100644
--- a/src/video/bwindow/SDL_syswm.cc
+++ b/src/video/bwindow/SDL_syswm.cc
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/bwindow/SDL_syswm_c.h b/src/video/bwindow/SDL_syswm_c.h
index 2e1462d..c45ceb9 100644
--- a/src/video/bwindow/SDL_syswm_c.h
+++ b/src/video/bwindow/SDL_syswm_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_amigaevents.c b/src/video/cybergfx/SDL_amigaevents.c
index 2b2452a..75591d6 100644
--- a/src/video/cybergfx/SDL_amigaevents.c
+++ b/src/video/cybergfx/SDL_amigaevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_amigaevents_c.h b/src/video/cybergfx/SDL_amigaevents_c.h
index c5f8b68..8d6f957 100644
--- a/src/video/cybergfx/SDL_amigaevents_c.h
+++ b/src/video/cybergfx/SDL_amigaevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_amigamouse.c b/src/video/cybergfx/SDL_amigamouse.c
index 152804a..504e49a 100644
--- a/src/video/cybergfx/SDL_amigamouse.c
+++ b/src/video/cybergfx/SDL_amigamouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_amigamouse_c.h b/src/video/cybergfx/SDL_amigamouse_c.h
index b32153c..8d62fc6 100644
--- a/src/video/cybergfx/SDL_amigamouse_c.h
+++ b/src/video/cybergfx/SDL_amigamouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxgl.c b/src/video/cybergfx/SDL_cgxgl.c
index 4dd082b..0dc1e14 100644
--- a/src/video/cybergfx/SDL_cgxgl.c
+++ b/src/video/cybergfx/SDL_cgxgl.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxgl_c.h b/src/video/cybergfx/SDL_cgxgl_c.h
index 09df783..9c1935b 100644
--- a/src/video/cybergfx/SDL_cgxgl_c.h
+++ b/src/video/cybergfx/SDL_cgxgl_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgximage.c b/src/video/cybergfx/SDL_cgximage.c
index 1c960ae..c40b161 100644
--- a/src/video/cybergfx/SDL_cgximage.c
+++ b/src/video/cybergfx/SDL_cgximage.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgximage_c.h b/src/video/cybergfx/SDL_cgximage_c.h
index 42a2180..f64fd79 100644
--- a/src/video/cybergfx/SDL_cgximage_c.h
+++ b/src/video/cybergfx/SDL_cgximage_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxmodes.c b/src/video/cybergfx/SDL_cgxmodes.c
index 1628968..f2eb28c 100644
--- a/src/video/cybergfx/SDL_cgxmodes.c
+++ b/src/video/cybergfx/SDL_cgxmodes.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxmodes_c.h b/src/video/cybergfx/SDL_cgxmodes_c.h
index adee2d1..aabb136 100644
--- a/src/video/cybergfx/SDL_cgxmodes_c.h
+++ b/src/video/cybergfx/SDL_cgxmodes_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxvideo.c b/src/video/cybergfx/SDL_cgxvideo.c
index ad8cce7..38b7c72 100644
--- a/src/video/cybergfx/SDL_cgxvideo.c
+++ b/src/video/cybergfx/SDL_cgxvideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxvideo.h b/src/video/cybergfx/SDL_cgxvideo.h
index e7e5ee1..9083f02 100644
--- a/src/video/cybergfx/SDL_cgxvideo.h
+++ b/src/video/cybergfx/SDL_cgxvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxwm.c b/src/video/cybergfx/SDL_cgxwm.c
index 2cda950..5f07489 100644
--- a/src/video/cybergfx/SDL_cgxwm.c
+++ b/src/video/cybergfx/SDL_cgxwm.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxwm_c.h b/src/video/cybergfx/SDL_cgxwm_c.h
index 7fa2482..9677f1b 100644
--- a/src/video/cybergfx/SDL_cgxwm_c.h
+++ b/src/video/cybergfx/SDL_cgxwm_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxyuv.c b/src/video/cybergfx/SDL_cgxyuv.c
index 373e45f..21cbc9f 100644
--- a/src/video/cybergfx/SDL_cgxyuv.c
+++ b/src/video/cybergfx/SDL_cgxyuv.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/cybergfx/SDL_cgxyuv_c.h b/src/video/cybergfx/SDL_cgxyuv_c.h
index 8697f2c..9ff4b66 100644
--- a/src/video/cybergfx/SDL_cgxyuv_c.h
+++ b/src/video/cybergfx/SDL_cgxyuv_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/default_cursor.h b/src/video/default_cursor.h
index a4b2d38..7d947f3 100644
--- a/src/video/default_cursor.h
+++ b/src/video/default_cursor.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dga/SDL_dgaevents.c b/src/video/dga/SDL_dgaevents.c
index f669114..b28d1fb 100644
--- a/src/video/dga/SDL_dgaevents.c
+++ b/src/video/dga/SDL_dgaevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dga/SDL_dgaevents_c.h b/src/video/dga/SDL_dgaevents_c.h
index e5032c2..7d9b4a4 100644
--- a/src/video/dga/SDL_dgaevents_c.h
+++ b/src/video/dga/SDL_dgaevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dga/SDL_dgamouse.c b/src/video/dga/SDL_dgamouse.c
index a07f970..8b17851 100644
--- a/src/video/dga/SDL_dgamouse.c
+++ b/src/video/dga/SDL_dgamouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dga/SDL_dgamouse_c.h b/src/video/dga/SDL_dgamouse_c.h
index d975c77..fce17fe 100644
--- a/src/video/dga/SDL_dgamouse_c.h
+++ b/src/video/dga/SDL_dgamouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dga/SDL_dgavideo.c b/src/video/dga/SDL_dgavideo.c
index b845871..97edcc9 100644
--- a/src/video/dga/SDL_dgavideo.c
+++ b/src/video/dga/SDL_dgavideo.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dga/SDL_dgavideo.h b/src/video/dga/SDL_dgavideo.h
index a4cf1e0..a32af88 100644
--- a/src/video/dga/SDL_dgavideo.h
+++ b/src/video/dga/SDL_dgavideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/directfb/SDL_DirectFB_events.c b/src/video/directfb/SDL_DirectFB_events.c
index 096486a..9161be2 100644
--- a/src/video/directfb/SDL_DirectFB_events.c
+++ b/src/video/directfb/SDL_DirectFB_events.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/directfb/SDL_DirectFB_events.h b/src/video/directfb/SDL_DirectFB_events.h
index 74c108d..d1c2a42 100644
--- a/src/video/directfb/SDL_DirectFB_events.h
+++ b/src/video/directfb/SDL_DirectFB_events.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/directfb/SDL_DirectFB_video.c b/src/video/directfb/SDL_DirectFB_video.c
index 947f055..0a4da6b 100644
--- a/src/video/directfb/SDL_DirectFB_video.c
+++ b/src/video/directfb/SDL_DirectFB_video.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/directfb/SDL_DirectFB_video.h b/src/video/directfb/SDL_DirectFB_video.h
index 544b368..874c25d 100644
--- a/src/video/directfb/SDL_DirectFB_video.h
+++ b/src/video/directfb/SDL_DirectFB_video.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dummy/SDL_nullevents.c b/src/video/dummy/SDL_nullevents.c
index b3885b2..e0cf886 100644
--- a/src/video/dummy/SDL_nullevents.c
+++ b/src/video/dummy/SDL_nullevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dummy/SDL_nullevents_c.h b/src/video/dummy/SDL_nullevents_c.h
index 706466e..9034234 100644
--- a/src/video/dummy/SDL_nullevents_c.h
+++ b/src/video/dummy/SDL_nullevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dummy/SDL_nullmouse.c b/src/video/dummy/SDL_nullmouse.c
index 2c8778c..cd780eb 100644
--- a/src/video/dummy/SDL_nullmouse.c
+++ b/src/video/dummy/SDL_nullmouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dummy/SDL_nullmouse_c.h b/src/video/dummy/SDL_nullmouse_c.h
index f464c11..a8d493f 100644
--- a/src/video/dummy/SDL_nullmouse_c.h
+++ b/src/video/dummy/SDL_nullmouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dummy/SDL_nullvideo.c b/src/video/dummy/SDL_nullvideo.c
index 7ae0012..382026c 100644
--- a/src/video/dummy/SDL_nullvideo.c
+++ b/src/video/dummy/SDL_nullvideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/dummy/SDL_nullvideo.h b/src/video/dummy/SDL_nullvideo.h
index cde507c..c184b91 100644
--- a/src/video/dummy/SDL_nullvideo.h
+++ b/src/video/dummy/SDL_nullvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/epoc/SDL_epocevents.cpp b/src/video/epoc/SDL_epocevents.cpp
index 1b2f84d..4466b4b 100644
--- a/src/video/epoc/SDL_epocevents.cpp
+++ b/src/video/epoc/SDL_epocevents.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/video/epoc/SDL_epocevents_c.h b/src/video/epoc/SDL_epocevents_c.h
index 847bbd6..991845d 100644
--- a/src/video/epoc/SDL_epocevents_c.h
+++ b/src/video/epoc/SDL_epocevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/video/epoc/SDL_epocvideo.cpp b/src/video/epoc/SDL_epocvideo.cpp
index 706f8f3..c7a4777 100644
--- a/src/video/epoc/SDL_epocvideo.cpp
+++ b/src/video/epoc/SDL_epocvideo.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/video/epoc/SDL_epocvideo.h b/src/video/epoc/SDL_epocvideo.h
index c7fdcbf..2a4725b 100644
--- a/src/video/epoc/SDL_epocvideo.h
+++ b/src/video/epoc/SDL_epocvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/video/fbcon/3dfx_mmio.h b/src/video/fbcon/3dfx_mmio.h
index ad5d893..5e6311b 100644
--- a/src/video/fbcon/3dfx_mmio.h
+++ b/src/video/fbcon/3dfx_mmio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/3dfx_regs.h b/src/video/fbcon/3dfx_regs.h
index 5cc732b..b17755a 100644
--- a/src/video/fbcon/3dfx_regs.h
+++ b/src/video/fbcon/3dfx_regs.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fb3dfx.c b/src/video/fbcon/SDL_fb3dfx.c
index 82aa00f..0bed955 100644
--- a/src/video/fbcon/SDL_fb3dfx.c
+++ b/src/video/fbcon/SDL_fb3dfx.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fb3dfx.h b/src/video/fbcon/SDL_fb3dfx.h
index 2e2b8bb..7880f23 100644
--- a/src/video/fbcon/SDL_fb3dfx.h
+++ b/src/video/fbcon/SDL_fb3dfx.h
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbelo.c b/src/video/fbcon/SDL_fbelo.c
index 2f1946d..a4b29da 100644
--- a/src/video/fbcon/SDL_fbelo.c
+++ b/src/video/fbcon/SDL_fbelo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbelo.h b/src/video/fbcon/SDL_fbelo.h
index 8ffa77a..febaf87 100644
--- a/src/video/fbcon/SDL_fbelo.h
+++ b/src/video/fbcon/SDL_fbelo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbevents.c b/src/video/fbcon/SDL_fbevents.c
index dd393d2..2059e2f 100644
--- a/src/video/fbcon/SDL_fbevents.c
+++ b/src/video/fbcon/SDL_fbevents.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbevents_c.h b/src/video/fbcon/SDL_fbevents_c.h
index 040a9a8..eef00d9 100644
--- a/src/video/fbcon/SDL_fbevents_c.h
+++ b/src/video/fbcon/SDL_fbevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbmatrox.c b/src/video/fbcon/SDL_fbmatrox.c
index 5c9df71..1c62a22 100644
--- a/src/video/fbcon/SDL_fbmatrox.c
+++ b/src/video/fbcon/SDL_fbmatrox.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbmatrox.h b/src/video/fbcon/SDL_fbmatrox.h
index fab997f..5d929bd 100644
--- a/src/video/fbcon/SDL_fbmatrox.h
+++ b/src/video/fbcon/SDL_fbmatrox.h
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbmouse.c b/src/video/fbcon/SDL_fbmouse.c
index bed864e..948bd6e 100644
--- a/src/video/fbcon/SDL_fbmouse.c
+++ b/src/video/fbcon/SDL_fbmouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbmouse_c.h b/src/video/fbcon/SDL_fbmouse_c.h
index 6227a1b..c94eef5 100644
--- a/src/video/fbcon/SDL_fbmouse_c.h
+++ b/src/video/fbcon/SDL_fbmouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbriva.c b/src/video/fbcon/SDL_fbriva.c
index 6f02657..6cb0755 100644
--- a/src/video/fbcon/SDL_fbriva.c
+++ b/src/video/fbcon/SDL_fbriva.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbriva.h b/src/video/fbcon/SDL_fbriva.h
index 61f5784..1994551 100644
--- a/src/video/fbcon/SDL_fbriva.h
+++ b/src/video/fbcon/SDL_fbriva.h
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbvideo.c b/src/video/fbcon/SDL_fbvideo.c
index 85e687e..f5c3f23 100644
--- a/src/video/fbcon/SDL_fbvideo.c
+++ b/src/video/fbcon/SDL_fbvideo.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/SDL_fbvideo.h b/src/video/fbcon/SDL_fbvideo.h
index b14f53c..295037e 100644
--- a/src/video/fbcon/SDL_fbvideo.h
+++ b/src/video/fbcon/SDL_fbvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/matrox_mmio.h b/src/video/fbcon/matrox_mmio.h
index 7206bf2..7b268ba 100644
--- a/src/video/fbcon/matrox_mmio.h
+++ b/src/video/fbcon/matrox_mmio.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/fbcon/riva_regs.h b/src/video/fbcon/riva_regs.h
index 7faeb5c..3b312e9 100644
--- a/src/video/fbcon/riva_regs.h
+++ b/src/video/fbcon/riva_regs.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ggi/SDL_ggievents.c b/src/video/ggi/SDL_ggievents.c
index 1d3869c..7fb404d 100644
--- a/src/video/ggi/SDL_ggievents.c
+++ b/src/video/ggi/SDL_ggievents.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ggi/SDL_ggievents_c.h b/src/video/ggi/SDL_ggievents_c.h
index d083cc5..587bd96 100755
--- a/src/video/ggi/SDL_ggievents_c.h
+++ b/src/video/ggi/SDL_ggievents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ggi/SDL_ggimouse.c b/src/video/ggi/SDL_ggimouse.c
index 2a3d475..0c9dc1b 100644
--- a/src/video/ggi/SDL_ggimouse.c
+++ b/src/video/ggi/SDL_ggimouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ggi/SDL_ggimouse_c.h b/src/video/ggi/SDL_ggimouse_c.h
index bde9471..82203c9 100755
--- a/src/video/ggi/SDL_ggimouse_c.h
+++ b/src/video/ggi/SDL_ggimouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ggi/SDL_ggivideo.c b/src/video/ggi/SDL_ggivideo.c
index 34e0fda..cd9ed38 100644
--- a/src/video/ggi/SDL_ggivideo.c
+++ b/src/video/ggi/SDL_ggivideo.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ggi/SDL_ggivideo.h b/src/video/ggi/SDL_ggivideo.h
index 8b4ea99..7eff41c 100644
--- a/src/video/ggi/SDL_ggivideo.h
+++ b/src/video/ggi/SDL_ggivideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_lowvideo.h b/src/video/maccommon/SDL_lowvideo.h
index cba1399..1bc0eef 100644
--- a/src/video/maccommon/SDL_lowvideo.h
+++ b/src/video/maccommon/SDL_lowvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macevents.c b/src/video/maccommon/SDL_macevents.c
index 33f37c8..6ffa877 100644
--- a/src/video/maccommon/SDL_macevents.c
+++ b/src/video/maccommon/SDL_macevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macevents_c.h b/src/video/maccommon/SDL_macevents_c.h
index 5e53967..56ac38a 100644
--- a/src/video/maccommon/SDL_macevents_c.h
+++ b/src/video/maccommon/SDL_macevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macgl.c b/src/video/maccommon/SDL_macgl.c
index 56d7716..63347a7 100644
--- a/src/video/maccommon/SDL_macgl.c
+++ b/src/video/maccommon/SDL_macgl.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macgl_c.h b/src/video/maccommon/SDL_macgl_c.h
index 40a2681..6a08877 100644
--- a/src/video/maccommon/SDL_macgl_c.h
+++ b/src/video/maccommon/SDL_macgl_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_mackeys.h b/src/video/maccommon/SDL_mackeys.h
index 0f266e9..4042516 100644
--- a/src/video/maccommon/SDL_mackeys.h
+++ b/src/video/maccommon/SDL_mackeys.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macmouse.c b/src/video/maccommon/SDL_macmouse.c
index d1bd659..1b29b3e 100644
--- a/src/video/maccommon/SDL_macmouse.c
+++ b/src/video/maccommon/SDL_macmouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macmouse_c.h b/src/video/maccommon/SDL_macmouse_c.h
index 523737d..c3174aa 100644
--- a/src/video/maccommon/SDL_macmouse_c.h
+++ b/src/video/maccommon/SDL_macmouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macwm.c b/src/video/maccommon/SDL_macwm.c
index f509dc8..0216d04 100644
--- a/src/video/maccommon/SDL_macwm.c
+++ b/src/video/maccommon/SDL_macwm.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/maccommon/SDL_macwm_c.h b/src/video/maccommon/SDL_macwm_c.h
index 6fd72bf..7d84cbb 100644
--- a/src/video/maccommon/SDL_macwm_c.h
+++ b/src/video/maccommon/SDL_macwm_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/macdsp/SDL_dspvideo.c b/src/video/macdsp/SDL_dspvideo.c
index a962b29..88574f6 100644
--- a/src/video/macdsp/SDL_dspvideo.c
+++ b/src/video/macdsp/SDL_dspvideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*
diff --git a/src/video/macdsp/SDL_dspvideo.h b/src/video/macdsp/SDL_dspvideo.h
index 2b09a18..404961c 100644
--- a/src/video/macdsp/SDL_dspvideo.h
+++ b/src/video/macdsp/SDL_dspvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/macrom/SDL_romvideo.c b/src/video/macrom/SDL_romvideo.c
index 5dcada3..cac7954 100644
--- a/src/video/macrom/SDL_romvideo.c
+++ b/src/video/macrom/SDL_romvideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/macrom/SDL_romvideo.h b/src/video/macrom/SDL_romvideo.h
index 37676e4..75976bb 100644
--- a/src/video/macrom/SDL_romvideo.h
+++ b/src/video/macrom/SDL_romvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/nanox/SDL_nxevents.c b/src/video/nanox/SDL_nxevents.c
index 6acd4b4..495bdaa 100644
--- a/src/video/nanox/SDL_nxevents.c
+++ b/src/video/nanox/SDL_nxevents.c
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxevents_c.h b/src/video/nanox/SDL_nxevents_c.h
index 5a5bb46..bd219dd 100644
--- a/src/video/nanox/SDL_nxevents_c.h
+++ b/src/video/nanox/SDL_nxevents_c.h
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nximage.c b/src/video/nanox/SDL_nximage.c
index 3c11d4e..6d6cdc4 100644
--- a/src/video/nanox/SDL_nximage.c
+++ b/src/video/nanox/SDL_nximage.c
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nximage_c.h b/src/video/nanox/SDL_nximage_c.h
index 361c03f..af63c5b 100644
--- a/src/video/nanox/SDL_nximage_c.h
+++ b/src/video/nanox/SDL_nximage_c.h
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxmodes.c b/src/video/nanox/SDL_nxmodes.c
index 974005e..360ea2e 100644
--- a/src/video/nanox/SDL_nxmodes.c
+++ b/src/video/nanox/SDL_nxmodes.c
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxmodes_c.h b/src/video/nanox/SDL_nxmodes_c.h
index 2988333..f83f5bf 100644
--- a/src/video/nanox/SDL_nxmodes_c.h
+++ b/src/video/nanox/SDL_nxmodes_c.h
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxmouse.c b/src/video/nanox/SDL_nxmouse.c
index 34f88e3..73f327d 100644
--- a/src/video/nanox/SDL_nxmouse.c
+++ b/src/video/nanox/SDL_nxmouse.c
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxvideo.c b/src/video/nanox/SDL_nxvideo.c
index cb122e1..680b39e 100644
--- a/src/video/nanox/SDL_nxvideo.c
+++ b/src/video/nanox/SDL_nxvideo.c
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxvideo.h b/src/video/nanox/SDL_nxvideo.h
index aa2dceb..6a67ef1 100644
--- a/src/video/nanox/SDL_nxvideo.h
+++ b/src/video/nanox/SDL_nxvideo.h
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxwm.c b/src/video/nanox/SDL_nxwm.c
index 3fa94fa..28f6efc 100644
--- a/src/video/nanox/SDL_nxwm.c
+++ b/src/video/nanox/SDL_nxwm.c
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/nanox/SDL_nxwm_c.h b/src/video/nanox/SDL_nxwm_c.h
index d9d5b98..9e1076a 100644
--- a/src/video/nanox/SDL_nxwm_c.h
+++ b/src/video/nanox/SDL_nxwm_c.h
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
     
     Hsieh-Fu Tsai
     clare@setabox.com
diff --git a/src/video/photon/SDL_ph_events.c b/src/video/photon/SDL_ph_events.c
index 9b09dfb..29e97ed 100644
--- a/src/video/photon/SDL_ph_events.c
+++ b/src/video/photon/SDL_ph_events.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_events_c.h b/src/video/photon/SDL_ph_events_c.h
index 599217d..66e85c3 100644
--- a/src/video/photon/SDL_ph_events_c.h
+++ b/src/video/photon/SDL_ph_events_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_image.c b/src/video/photon/SDL_ph_image.c
index d282b7e..46b5afa 100644
--- a/src/video/photon/SDL_ph_image.c
+++ b/src/video/photon/SDL_ph_image.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_image_c.h b/src/video/photon/SDL_ph_image_c.h
index f0c350b..6352f67 100644
--- a/src/video/photon/SDL_ph_image_c.h
+++ b/src/video/photon/SDL_ph_image_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_modes.c b/src/video/photon/SDL_ph_modes.c
index 7e283eb..5889c2b 100644
--- a/src/video/photon/SDL_ph_modes.c
+++ b/src/video/photon/SDL_ph_modes.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_modes_c.h b/src/video/photon/SDL_ph_modes_c.h
index 7de8da1..d98d4d7 100644
--- a/src/video/photon/SDL_ph_modes_c.h
+++ b/src/video/photon/SDL_ph_modes_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_mouse.c b/src/video/photon/SDL_ph_mouse.c
index 1e7b1bb..e496853 100644
--- a/src/video/photon/SDL_ph_mouse.c
+++ b/src/video/photon/SDL_ph_mouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_mouse_c.h b/src/video/photon/SDL_ph_mouse_c.h
index c06ea6a..e9110d0 100644
--- a/src/video/photon/SDL_ph_mouse_c.h
+++ b/src/video/photon/SDL_ph_mouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_video.c b/src/video/photon/SDL_ph_video.c
index ad273f2..dbca76e 100644
--- a/src/video/photon/SDL_ph_video.c
+++ b/src/video/photon/SDL_ph_video.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_video.h b/src/video/photon/SDL_ph_video.h
index 22cc9ed..e09e480 100644
--- a/src/video/photon/SDL_ph_video.h
+++ b/src/video/photon/SDL_ph_video.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 /*
 static PhEvent_t *event;
diff --git a/src/video/photon/SDL_ph_wm.c b/src/video/photon/SDL_ph_wm.c
index 5d6e370..a30e891 100644
--- a/src/video/photon/SDL_ph_wm.c
+++ b/src/video/photon/SDL_ph_wm.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_ph_wm_c.h b/src/video/photon/SDL_ph_wm_c.h
index 94ea648..dbba038 100644
--- a/src/video/photon/SDL_ph_wm_c.h
+++ b/src/video/photon/SDL_ph_wm_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_phyuv.c b/src/video/photon/SDL_phyuv.c
index 0d82fbb..63fddf8 100644
--- a/src/video/photon/SDL_phyuv.c
+++ b/src/video/photon/SDL_phyuv.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/photon/SDL_phyuv_c.h b/src/video/photon/SDL_phyuv_c.h
index 3c0059e..7e37d10 100644
--- a/src/video/photon/SDL_phyuv_c.h
+++ b/src/video/photon/SDL_phyuv_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsevents.c b/src/video/ps2gs/SDL_gsevents.c
index 35c73ab..1e80391 100644
--- a/src/video/ps2gs/SDL_gsevents.c
+++ b/src/video/ps2gs/SDL_gsevents.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsevents_c.h b/src/video/ps2gs/SDL_gsevents_c.h
index 861f035..63e95bb 100644
--- a/src/video/ps2gs/SDL_gsevents_c.h
+++ b/src/video/ps2gs/SDL_gsevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsmouse.c b/src/video/ps2gs/SDL_gsmouse.c
index 92f41c1..c1f9869 100644
--- a/src/video/ps2gs/SDL_gsmouse.c
+++ b/src/video/ps2gs/SDL_gsmouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsmouse_c.h b/src/video/ps2gs/SDL_gsmouse_c.h
index b15253b..6d09283 100644
--- a/src/video/ps2gs/SDL_gsmouse_c.h
+++ b/src/video/ps2gs/SDL_gsmouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsvideo.c b/src/video/ps2gs/SDL_gsvideo.c
index 7f5abf7..03b03d0 100644
--- a/src/video/ps2gs/SDL_gsvideo.c
+++ b/src/video/ps2gs/SDL_gsvideo.c
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsvideo.h b/src/video/ps2gs/SDL_gsvideo.h
index 9586327..d2dea03 100644
--- a/src/video/ps2gs/SDL_gsvideo.h
+++ b/src/video/ps2gs/SDL_gsvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsyuv.c b/src/video/ps2gs/SDL_gsyuv.c
index ea1dfe2..4b686a1 100644
--- a/src/video/ps2gs/SDL_gsyuv.c
+++ b/src/video/ps2gs/SDL_gsyuv.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/ps2gs/SDL_gsyuv_c.h b/src/video/ps2gs/SDL_gsyuv_c.h
index 63db9b4..1309298 100644
--- a/src/video/ps2gs/SDL_gsyuv_c.h
+++ b/src/video/ps2gs/SDL_gsyuv_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/quartz/SDL_QuartzEvents.m b/src/video/quartz/SDL_QuartzEvents.m
index 2c12d53..c7dadac 100644
--- a/src/video/quartz/SDL_QuartzEvents.m
+++ b/src/video/quartz/SDL_QuartzEvents.m
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 	Sam Lantinga
-	slouken@devolution.com
+	slouken@libsdl.org
 */
 
 #include "SDL_QuartzKeys.h"
diff --git a/src/video/quartz/SDL_QuartzKeys.h b/src/video/quartz/SDL_QuartzKeys.h
index 7c08f26..ecb7ad5 100644
--- a/src/video/quartz/SDL_QuartzKeys.h
+++ b/src/video/quartz/SDL_QuartzKeys.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* These are the Macintosh key scancode constants -- from Inside Macintosh */
diff --git a/src/video/quartz/SDL_QuartzVideo.h b/src/video/quartz/SDL_QuartzVideo.h
index 10a0aa3..3ee3ddf 100644
--- a/src/video/quartz/SDL_QuartzVideo.h
+++ b/src/video/quartz/SDL_QuartzVideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /*	
diff --git a/src/video/quartz/SDL_QuartzVideo.m b/src/video/quartz/SDL_QuartzVideo.m
index 776248b..e3c542f 100644
--- a/src/video/quartz/SDL_QuartzVideo.m
+++ b/src/video/quartz/SDL_QuartzVideo.m
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #include "SDL_QuartzVideo.h"
diff --git a/src/video/quartz/SDL_QuartzWM.m b/src/video/quartz/SDL_QuartzWM.m
index 707f86d..8ace651 100644
--- a/src/video/quartz/SDL_QuartzWM.m
+++ b/src/video/quartz/SDL_QuartzWM.m
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 struct WMcursor {
diff --git a/src/video/svga/SDL_svgaevents.c b/src/video/svga/SDL_svgaevents.c
index 0c9a36a..b41b52b 100644
--- a/src/video/svga/SDL_svgaevents.c
+++ b/src/video/svga/SDL_svgaevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/svga/SDL_svgaevents_c.h b/src/video/svga/SDL_svgaevents_c.h
index 78b3874..781f417 100644
--- a/src/video/svga/SDL_svgaevents_c.h
+++ b/src/video/svga/SDL_svgaevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/svga/SDL_svgamouse.c b/src/video/svga/SDL_svgamouse.c
index 4a761d0..403672c 100644
--- a/src/video/svga/SDL_svgamouse.c
+++ b/src/video/svga/SDL_svgamouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/svga/SDL_svgamouse_c.h b/src/video/svga/SDL_svgamouse_c.h
index 91b7e4b..37f0927 100644
--- a/src/video/svga/SDL_svgamouse_c.h
+++ b/src/video/svga/SDL_svgamouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/svga/SDL_svgavideo.c b/src/video/svga/SDL_svgavideo.c
index 9394536..16819d9 100644
--- a/src/video/svga/SDL_svgavideo.c
+++ b/src/video/svga/SDL_svgavideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/svga/SDL_svgavideo.h b/src/video/svga/SDL_svgavideo.h
index 1510fcd..eeb1552 100644
--- a/src/video/svga/SDL_svgavideo.h
+++ b/src/video/svga/SDL_svgavideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/vgl/SDL_vglevents.c b/src/video/vgl/SDL_vglevents.c
index 001b389..a924dad 100644
--- a/src/video/vgl/SDL_vglevents.c
+++ b/src/video/vgl/SDL_vglevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/vgl/SDL_vglevents_c.h b/src/video/vgl/SDL_vglevents_c.h
index 6b043b6..34f6915 100644
--- a/src/video/vgl/SDL_vglevents_c.h
+++ b/src/video/vgl/SDL_vglevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/vgl/SDL_vglmouse.c b/src/video/vgl/SDL_vglmouse.c
index bc7fd4b..4f700c8 100644
--- a/src/video/vgl/SDL_vglmouse.c
+++ b/src/video/vgl/SDL_vglmouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/vgl/SDL_vglmouse_c.h b/src/video/vgl/SDL_vglmouse_c.h
index f360d63..e24cfba 100644
--- a/src/video/vgl/SDL_vglmouse_c.h
+++ b/src/video/vgl/SDL_vglmouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/vgl/SDL_vglvideo.c b/src/video/vgl/SDL_vglvideo.c
index 08f2b93..f676cd4 100644
--- a/src/video/vgl/SDL_vglvideo.c
+++ b/src/video/vgl/SDL_vglvideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/vgl/SDL_vglvideo.h b/src/video/vgl/SDL_vglvideo.h
index c1b8c05..f5331c3 100644
--- a/src/video/vgl/SDL_vglvideo.h
+++ b/src/video/vgl/SDL_vglvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_lowvideo.h b/src/video/wincommon/SDL_lowvideo.h
index 1ee8722..84475c4 100644
--- a/src/video/wincommon/SDL_lowvideo.h
+++ b/src/video/wincommon/SDL_lowvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_sysevents.c b/src/video/wincommon/SDL_sysevents.c
index 97dfef4..9b4bc0e 100644
--- a/src/video/wincommon/SDL_sysevents.c
+++ b/src/video/wincommon/SDL_sysevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_sysmouse.c b/src/video/wincommon/SDL_sysmouse.c
index 993c45d..219bbff 100644
--- a/src/video/wincommon/SDL_sysmouse.c
+++ b/src/video/wincommon/SDL_sysmouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_sysmouse_c.h b/src/video/wincommon/SDL_sysmouse_c.h
index 7f8b863..0f51183 100644
--- a/src/video/wincommon/SDL_sysmouse_c.h
+++ b/src/video/wincommon/SDL_sysmouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_syswm.c b/src/video/wincommon/SDL_syswm.c
index 0cbad42..c33f145 100644
--- a/src/video/wincommon/SDL_syswm.c
+++ b/src/video/wincommon/SDL_syswm.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_syswm_c.h b/src/video/wincommon/SDL_syswm_c.h
index 5d35581..489bb69 100644
--- a/src/video/wincommon/SDL_syswm_c.h
+++ b/src/video/wincommon/SDL_syswm_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_wingl.c b/src/video/wincommon/SDL_wingl.c
index e3fdab5..54dec69 100644
--- a/src/video/wincommon/SDL_wingl.c
+++ b/src/video/wincommon/SDL_wingl.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/wincommon/SDL_wingl_c.h b/src/video/wincommon/SDL_wingl_c.h
index 3fcc68d..5ba4f41 100644
--- a/src/video/wincommon/SDL_wingl_c.h
+++ b/src/video/wincommon/SDL_wingl_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c
index 6787801..1352dcd 100644
--- a/src/video/windib/SDL_dibevents.c
+++ b/src/video/windib/SDL_dibevents.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windib/SDL_dibevents_c.h b/src/video/windib/SDL_dibevents_c.h
index 1caeb47..829b8e7 100644
--- a/src/video/windib/SDL_dibevents_c.h
+++ b/src/video/windib/SDL_dibevents_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windib/SDL_dibvideo.c b/src/video/windib/SDL_dibvideo.c
index cec7bf3..e840129 100644
--- a/src/video/windib/SDL_dibvideo.c
+++ b/src/video/windib/SDL_dibvideo.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windib/SDL_dibvideo.h b/src/video/windib/SDL_dibvideo.h
index bdac5c3..d675dc9 100644
--- a/src/video/windib/SDL_dibvideo.h
+++ b/src/video/windib/SDL_dibvideo.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windib/SDL_vkeys.h b/src/video/windib/SDL_vkeys.h
index b56b910..71044dc 100644
--- a/src/video/windib/SDL_vkeys.h
+++ b/src/video/windib/SDL_vkeys.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c
index 95ba16f..1fa3634 100644
--- a/src/video/windx5/SDL_dx5events.c
+++ b/src/video/windx5/SDL_dx5events.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windx5/SDL_dx5events_c.h b/src/video/windx5/SDL_dx5events_c.h
index 7420016..ef5774a 100644
--- a/src/video/windx5/SDL_dx5events_c.h
+++ b/src/video/windx5/SDL_dx5events_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windx5/SDL_dx5video.c b/src/video/windx5/SDL_dx5video.c
index d96d1e7..2d6f9c4 100644
--- a/src/video/windx5/SDL_dx5video.c
+++ b/src/video/windx5/SDL_dx5video.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windx5/SDL_dx5video.h b/src/video/windx5/SDL_dx5video.h
index e5271e8..4edf4a8 100644
--- a/src/video/windx5/SDL_dx5video.h
+++ b/src/video/windx5/SDL_dx5video.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windx5/SDL_dx5yuv.c b/src/video/windx5/SDL_dx5yuv.c
index 7028bbd..e835a10 100644
--- a/src/video/windx5/SDL_dx5yuv.c
+++ b/src/video/windx5/SDL_dx5yuv.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/windx5/SDL_dx5yuv_c.h b/src/video/windx5/SDL_dx5yuv_c.h
index ca4cf1d..52d2fac 100644
--- a/src/video/windx5/SDL_dx5yuv_c.h
+++ b/src/video/windx5/SDL_dx5yuv_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11dga.c b/src/video/x11/SDL_x11dga.c
index 7d9b8ad..8588b52 100644
--- a/src/video/x11/SDL_x11dga.c
+++ b/src/video/x11/SDL_x11dga.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11dga_c.h b/src/video/x11/SDL_x11dga_c.h
index 69d5e5e..f17ce68 100644
--- a/src/video/x11/SDL_x11dga_c.h
+++ b/src/video/x11/SDL_x11dga_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index 4f956c1..1b1fb87 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11events_c.h b/src/video/x11/SDL_x11events_c.h
index 229d7c7..af13011 100644
--- a/src/video/x11/SDL_x11events_c.h
+++ b/src/video/x11/SDL_x11events_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11gamma.c b/src/video/x11/SDL_x11gamma.c
index 1b96f76..1e3f4d7 100644
--- a/src/video/x11/SDL_x11gamma.c
+++ b/src/video/x11/SDL_x11gamma.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11gamma_c.h b/src/video/x11/SDL_x11gamma_c.h
index bd0714b..ac09598 100644
--- a/src/video/x11/SDL_x11gamma_c.h
+++ b/src/video/x11/SDL_x11gamma_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11gl.c b/src/video/x11/SDL_x11gl.c
index 8659506..12e1623 100644
--- a/src/video/x11/SDL_x11gl.c
+++ b/src/video/x11/SDL_x11gl.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11gl_c.h b/src/video/x11/SDL_x11gl_c.h
index 338610e..52f6bfa 100644
--- a/src/video/x11/SDL_x11gl_c.h
+++ b/src/video/x11/SDL_x11gl_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11image.c b/src/video/x11/SDL_x11image.c
index f7da206..d23b9a0 100644
--- a/src/video/x11/SDL_x11image.c
+++ b/src/video/x11/SDL_x11image.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11image_c.h b/src/video/x11/SDL_x11image_c.h
index db3463f..4be8cc1 100644
--- a/src/video/x11/SDL_x11image_c.h
+++ b/src/video/x11/SDL_x11image_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
index be3ece5..2a28051 100644
--- a/src/video/x11/SDL_x11modes.c
+++ b/src/video/x11/SDL_x11modes.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11modes_c.h b/src/video/x11/SDL_x11modes_c.h
index ef0a117..a45a196 100644
--- a/src/video/x11/SDL_x11modes_c.h
+++ b/src/video/x11/SDL_x11modes_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c
index 74e4558..7861558 100644
--- a/src/video/x11/SDL_x11mouse.c
+++ b/src/video/x11/SDL_x11mouse.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11mouse_c.h b/src/video/x11/SDL_x11mouse_c.h
index ed007e8..a1c68e5 100644
--- a/src/video/x11/SDL_x11mouse_c.h
+++ b/src/video/x11/SDL_x11mouse_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
index 7fcfd28..3bed59c 100644
--- a/src/video/x11/SDL_x11video.c
+++ b/src/video/x11/SDL_x11video.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h
index b2c53d9..8728510 100644
--- a/src/video/x11/SDL_x11video.h
+++ b/src/video/x11/SDL_x11video.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11wm.c b/src/video/x11/SDL_x11wm.c
index cc7bdea..46f44e0 100644
--- a/src/video/x11/SDL_x11wm.c
+++ b/src/video/x11/SDL_x11wm.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11wm_c.h b/src/video/x11/SDL_x11wm_c.h
index fdf8cbf..ff98073 100644
--- a/src/video/x11/SDL_x11wm_c.h
+++ b/src/video/x11/SDL_x11wm_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c
index f273b4e..bd5b7af 100644
--- a/src/video/x11/SDL_x11yuv.c
+++ b/src/video/x11/SDL_x11yuv.c
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/src/video/x11/SDL_x11yuv_c.h b/src/video/x11/SDL_x11yuv_c.h
index c854d66..db1cf14 100644
--- a/src/video/x11/SDL_x11yuv_c.h
+++ b/src/video/x11/SDL_x11yuv_c.h
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifdef SAVE_RCSID
diff --git a/test/COPYING b/test/COPYING
index 29f4097..c4c27e0 100644
--- a/test/COPYING
+++ b/test/COPYING
@@ -5,4 +5,4 @@
 
 October 28, 1997
 --
-	Sam Lantinga				(slouken@devolution.com)
+	Sam Lantinga				(slouken@libsdl.org)