diff --git a/wmppp.app/README b/wmppp.app/README
index bf0434e..6a697b7 100644
--- a/wmppp.app/README
+++ b/wmppp.app/README
@@ -3,17 +3,14 @@ WMPPP-1.3.0 - Public release
 Authors...: Martijn Pieterse (pieterse@xs4all.nl)
        	    Antoine Nulle    (warp@xs4all.nl)
 
-Note......: WMPPP has it's own mailbox, as our pop3 accounts
-			are already way too crowded :)
+Note......: Please mail bugreports, comments, suggestions,
+	    requests and flames to:
 
-			Please mail bugreports, comments, suggestions,
-			requests and flames to:
-
-			dockapps@warped.xs4all.nl
+	    wmaker-dev@lists.windowmaker.org
 
 			The official WMPPP support website address:
 
-     	    http://windowmaker.mezaway.org/
+	    http://windowmaker.org/dockapps/?name=wmppp.app
 
 
 Description
@@ -53,7 +50,7 @@ COPYING		GNU General Public License Version 2.
 Bugs
 --------------------------------------------------------------
 If you discover any bugs in this software, please send a
-bugreport to dockapps@warped.xs4all.nl and describe the
+bugreport to wmaker-dev@lists.windowmaker.org and describe the
 problem as detailed! as you can.
 
 
diff --git a/wmppp.app/TODO b/wmppp.app/TODO
index 5a15c4f..ecfefcd 100644
--- a/wmppp.app/TODO
+++ b/wmppp.app/TODO
@@ -8,6 +8,6 @@ TODO list for WMPPP.
 Your feedback! If you have nice suggestions, ideas, whatever,
 that aren't on this list, feel free to mail them to:
 
-		dockapps@warped.xs4all.nl
+		wmaker-dev@lists.windowmaker.org
 
 If you don't let us know... how are we suppose to know? ;-)
diff --git a/wmppp.app/wmppp/wmppp.1 b/wmppp.app/wmppp/wmppp.1
index 9eeec30..081a1e6 100644
--- a/wmppp.app/wmppp/wmppp.1
+++ b/wmppp.app/wmppp/wmppp.1
@@ -90,7 +90,7 @@ Longyear longyear@netcom.com\fP and \fIPaul Mackerras
 <Paul.Mackerras@cs.anu.edu.au>\fP (pppstats).
 .P
 Email regarding wmppp should be sent to
-\fIdockapps@windowmaker.kimitsu.com\fP.
+\fIwmaker-dev@lists.windowmaker.org\fP.
 .P
 This manpage was written by \fIMarcelo Magallon
 <mmagallo@debian.org\fP for the \fIDebian Project\fP