diff --git a/AUTHORS b/AUTHORS
index 14cd785cf..993ae6b1e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,7 +40,7 @@ Glenn McGrath <bug1@netconnect.com.au>
 Bruce Perens <bruce@pixar.com>
     Original author of BusyBox. His code is still in many apps.
 
-Pavel Roskin <pavel_roskin@geocities.com>
+Pavel Roskin <proski@gnu.org>
     Lots of bugs fixes and patches.
 
 Linus Torvalds <torvalds@transmeta.com>
diff --git a/Changelog b/Changelog
index d112f4eb5..07fd30d50 100644
--- a/Changelog
+++ b/Changelog
@@ -50,11 +50,11 @@
 	* Makefile intelligence updates
 	* Changed the way init parses /etc/inittab entries to avoid problems
 	    with commands that contain colons in them.  Fix thanks to 
-	    Pavel Roskin <pavel_roskin@geocities.com>
+	    Pavel Roskin <proski@gnu.org>
 	* Fixed a warning in utility.c due to char being unsigned on Linux/PPC, 
-	    Fix thanks to Pavel Roskin <pavel_roskin@geocities.com>
+	    Fix thanks to Pavel Roskin <proski@gnu.org>
 	* Made "killall" complain (not error and exit) about processes that it 
-	    cannot find by name -- Pavel Roskin <pavel_roskin@geocities.com> 
+	    cannot find by name -- Pavel Roskin <proski@gnu.org> 
 	* Fixed more and ps to have sensible terminal width defaults, thanks 
 	    to Pavel Roskin.
 	* Fixed all fatalError() calls lacking a "\n", thanks to Pavel Roskin.
@@ -116,7 +116,7 @@
 	* Added echo and test (from me).
 	* Added usleep contributed by Nicolas Pitre <nico@cam.org>
 	* BusyBox's bss size has been majorly reduced (was 384668, is now 28740).
-	* Several fixes from Pavel Roskin <pavel_roskin@geocities.com>:
+	* Several fixes from Pavel Roskin <proski@gnu.org>:
 	    - When `tail' fails to open a file it now exits.
 	    - When `syslogd' is given the `-n' option it should still use 
 		fork() for running klogd.
@@ -141,7 +141,7 @@
 	    - mv now attempts to do a rename, and will fall back to doing
 		a copy only if the rename fails.
 	    - Syslogd now supports multiple concurrent connections
-	* Several fixes from Pavel Roskin <pavel_roskin@geocities.com>:
+	* Several fixes from Pavel Roskin <proski@gnu.org>:
 	    - Fixes to sort.  Removed "-g", fixed and added "-r"
 	    - Fixes to the makefile for handling "strip"
 	* An initial telnet implementation was added by 
@@ -251,7 +251,7 @@
 	    Randolph Chung <tausq@debian.org>.
 	* cp could, when copying symlinks, change permissions of the
 	    files pointed to by the symlinks.
-	* Several fixes from Pavel Roskin <pavel_roskin@geocities.com>:
+	* Several fixes from Pavel Roskin <proski@gnu.org>:
 	    - `chown' with 1 argument displayed the error incorrectly
 	    - `fdflush', `length' and `printf' crashed if run without arguments
 	    - `fdflush' tried to flush itself using *argv
diff --git a/docs/busybox.pod b/docs/busybox.pod
index a43ebaf44..8b1b7155f 100644
--- a/docs/busybox.pod
+++ b/docs/busybox.pod
@@ -2003,7 +2003,7 @@ Bruce Perens <bruce@perens.com>
 
 =for html <br>
 
-Pavel Roskin <pavel_roskin@geocities.com>
+Pavel Roskin <proski@gnu.org>
 
 =for html <br>
 
@@ -2021,4 +2021,4 @@ Enrique Zanardi <ezanardi@ull.es>
 
 =cut
 
-# $Id: busybox.pod,v 1.42 2000/06/16 19:56:44 andersen Exp $
+# $Id: busybox.pod,v 1.43 2000/06/20 00:11:07 proski Exp $