diff --git a/po/ChangeLog b/po/ChangeLog
index 2398250ba4a202d6b5101c6742748408f092efb2..e977e4db64d5338321cd882ab0aa5cda195159b5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -7,7 +7,7 @@
 	* en_GB.po: updated Britisch translation
 	by Jeff Bailes <thepizzaking@gmail.com>
 
-2007-04-10  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-04-10  Maximilian Schleiss <maximilian@xfce.org>
 
 	* de.po: Updated the German translation
 	by Nico Schümann <nico@prog.nico22.de>
@@ -16,7 +16,7 @@
 
 	* nl.po: Updated the Dutch translation
 
-2007-04-07  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-04-07  Maximilian Schleiss <maximilian@xfce.org>
 
 	* fr.po: Updated the French translation
 
@@ -28,7 +28,7 @@
 
 	* tr.po: Updated the Turkish translation.
 
-2007-03-28  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-03-28  Maximilian Schleiss <maximilian@xfce.org>
 
 	* de.po: Minor fixes to the German translation
 	by Nico Schümann <nico@prog.nico22.de>
@@ -43,7 +43,7 @@
 
 	* tr.po: Updated the Turkish translation.
 
-2007-02-10  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-02-10  Maximilian Schleiss <maximilian@xfce.org>
 
 	* Modified LINGUAS files to include Albanian language,
 	verified all the LINGUAS files.
@@ -53,17 +53,17 @@
 	* ar.po: initial commit.
 	* LINGUAS: adding ar language code
 
-2007-02-07  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-02-07  Maximilian Schleiss <maximilian@xfce.org>
 
 	* zh_CN.po: Updated the Chinese (Simplified) translation by
 	Wu Li <wurisky@gmail.com>
 
-2007-01-24  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-01-24  Maximilian Schleiss <maximilian@xfce.org>
 
 	* sq.po: Added the Albanian translation by
 	Besnik Bleta <besnik@programeshqip.org>
 
-2007-01-21  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-01-21  Maximilian Schleiss <maximilian@xfce.org>
 
 	* ro.po: Updated the Romanian translation by
 	MiÅŸu Moldovan <dumol@gnome.ro>
@@ -84,17 +84,17 @@
 
 	* sv.po: Updated Swedish translation.
 
-2007-01-05  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-01-05  Maximilian Schleiss <maximilian@xfce.org>
 
 	* de.po: Updated the German translation by
 	Fabian Nowak <timystery@arcor.de>
 
-2007-01-02  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2007-01-02  Maximilian Schleiss <maximilian@xfce.org>
 
 	* be.po: Updated the Belarusian translation by
 	Ales Nyakhaychyk <nab@mail.by>
 
-2006-12-25  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2006-12-25  Maximilian Schleiss <maximilian@xfce.org>
 
 	* mk.po: Added the Macedonian translation by
 	Jovan Naumovski <jovan@lugola.net>
@@ -112,7 +112,7 @@
 
 	* ca.po: Updated Catalan translation
 
-2006-10-16  Maximilian Schleiss <maxschleiss@bluewin.ch>
+2006-10-16  Maximilian Schleiss <maximilian@xfce.org>
 
 	* fr.po: Fixed some typos in the French translation.
 
diff --git a/po/fr.po b/po/fr.po
index c7c34982eaceee57cffb8e50c96a18d05eadca45..022c630827da8565c8e1e62256460cec53611a80 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2002-2006 The Xfce development team.
 # This file is distributed under the same license as the xfwm4 package.
 # Olivier Fourdan <fourdan@xfce.org>, 2002-2006.
-# Maximilian Schleiss <maxschleiss@solnet.ch>, 2006.
+# Maximilian Schleiss <maximilian@xfce.org>, 2006.
 #
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-04-19 22:42+0200\n"
 "PO-Revision-Date: 2007-04-03 15:43+0100\n"
-"Last-Translator: Maximilian Schleiss <maxschleiss@solnet.ch>\n"
+"Last-Translator: Maximilian Schleiss <maximilian@xfce.org>\n"
 "Language-Team: French <xfce-i18n@xfce.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"