diff --git a/AUTHORS b/AUTHORS
index 49c3513e30..e5e2cc5db3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -191,7 +191,7 @@ Di Vita, Piero (Scognito) <scognito@libero.it>
     * new GUI icons
     * skin review part II
 
-Diedrich, Tobias (ranma) <ranma@gmx.at>
+Diedrich, Tobias (ranma) <ranma+mplayer@tdiedrich.de>
     * NAS audio output driver
     * DXR2 driver
     * softpulldown video filter
diff --git a/DOCS/tech/mncf.txt b/DOCS/tech/mncf.txt
index 8d3061dbd2..a43f299b1a 100644
--- a/DOCS/tech/mncf.txt
+++ b/DOCS/tech/mncf.txt
@@ -650,7 +650,7 @@ Folks from MPlayer Developers Mailinglist (http://www.mplayehrq.hu/).
 Authors in ABC-order: (FIXME! Tell us if we left you out)
     Beregszaszi, Alex (alex@fsn.hu)
     Bunkus, Moritz (moritz@bunkus.org)
-    Diedrich, Tobias (td@sim.uni-hannover.de)
+    Diedrich, Tobias (ranma+mplayer@tdiedrich.de)
     Felker, Rich (dalias@aerifal.cx)
     Franz, Fabian (FabianFranz@gmx.de)
     Gereoffy, Arpad (arpi@thot.banki.hu)
diff --git a/DOCS/tech/mpcf.txt b/DOCS/tech/mpcf.txt
index 12b17434a1..8f27126d5e 100644
--- a/DOCS/tech/mpcf.txt
+++ b/DOCS/tech/mpcf.txt
@@ -686,7 +686,7 @@ Folks from MPlayer Developers Mailinglist (http://www.mplayehrq.hu/).
 Authors in ABC-order: (FIXME! Tell us if we left you out)
     Beregszaszi, Alex (alex@fsn.hu)
     Bunkus, Moritz (moritz@bunkus.org)
-    Diedrich, Tobias (td@sim.uni-hannover.de)
+    Diedrich, Tobias (ranma+mplayer@tdiedrich.de)
     Felker, Rich (dalias@aerifal.cx)
     Franz, Fabian (FabianFranz@gmx.de)
     Gereoffy, Arpad (arpi@thot.banki.hu)
diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c
index f495d12ed4..dc77e95099 100644
--- a/libao2/ao_dxr2.c
+++ b/libao2/ao_dxr2.c
@@ -18,7 +18,7 @@ static ao_info_t info =
 {
 	"DXR2 audio output",
 	"dxr2",
-	"Tobias Diedrich <ranma@gmx.at>",
+	"Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
 	""
 };
 
diff --git a/libao2/ao_null.c b/libao2/ao_null.c
index 6694348af9..70e3a52b31 100644
--- a/libao2/ao_null.c
+++ b/libao2/ao_null.c
@@ -11,7 +11,7 @@ static ao_info_t info =
 {
 	"Null audio output",
 	"null",
-	"Tobias Diedrich",
+	"Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
 	""
 };
 
diff --git a/libmpcodecs/vf_softpulldown.c b/libmpcodecs/vf_softpulldown.c
index 67811a1362..924d088595 100644
--- a/libmpcodecs/vf_softpulldown.c
+++ b/libmpcodecs/vf_softpulldown.c
@@ -155,7 +155,7 @@ static int open(vf_instance_t *vf, char* args)
 vf_info_t vf_info_softpulldown = {
     "mpeg2 soft 3:2 pulldown",
     "softpulldown",
-    "Tobias Diedrich",
+    "Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
     "",
     open,
     NULL