diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 3de08cc1a092ad739270691af1b858e2353b6d1f..30eaf3cfd253ecad02e1c07bc66a29db6e0f7baa 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -22,7 +22,7 @@
 /**
  * @file libavcodec/eacmv.c
  * Electronic Arts CMV Video Decoder
- * by Peter Ross (suxen_drol at hotmail dot com)
+ * by Peter Ross (pross@xvid.org)
  *
  * Technical details here:
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index f2fa2fa982ea69aa88d62d905eeea3e335805881..bfaf2d41588bc373fb0196364063ac99081f0920 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -22,7 +22,7 @@
 /**
  * @file libavcodec/eatgv.c
  * Electronic Arts TGV Video Decoder
- * by Peter Ross (suxen_drol at hotmail dot com)
+ * by Peter Ross (pross@xvid.org)
  *
  * Technical details here:
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 596ca7aec47b0fb8067384f5bc992c4c7a2e2836..0b45b77474a29e58a05fd58b04bcf2dc9cccf143 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -22,7 +22,7 @@
 /**
  * @file libavcodec/mmvideo.c
  * American Laser Games MM Video Decoder
- * by Peter Ross (suxen_drol at hotmail dot com)
+ * by Peter Ross (pross@xvid.org)
  *
  * The MM format was used by IBM-PC ports of ALG's "arcade shooter" games,
  * including Mad Dog McCree and Crime Patrol.
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index f4ea2f2e98942e0eec70d6237188d9bee8f8a12f..5e2594c927e6606c4794487739d4202a8a5ba226 100644
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -22,7 +22,7 @@
 /**
  * @file libavformat/eacdata.c
  * Electronic Arts cdata Format Demuxer
- * by Peter Ross (suxen_drol at hotmail dot com)
+ * by Peter Ross (pross@xvid.org)
  *
  * Technical details here:
  *  http://wiki.multimedia.cx/index.php?title=EA_Command_And_Conquer_3_Audio_Codec
diff --git a/libavformat/mm.c b/libavformat/mm.c
index 993aebf32ff12c88e86d1ff1185cf88ccd6814fb..effb9e4f49c5d466825621dda32c7c85416239ba 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -22,7 +22,7 @@
 /**
  * @file libavformat/mm.c
  * American Laser Games MM Format Demuxer
- * by Peter Ross (suxen_drol at hotmail dot com)
+ * by Peter Ross (pross@xvid.org)
  *
  * The MM format was used by IBM-PC ports of ALG's "arcade shooter" games,
  * including Mad Dog McCree and Crime Patrol.