diff --git a/AUTHORS b/AUTHORS
index 7c54c71ebe22bab91d8fd7dfccabf1032062fc90..a82ac35e05204ba5b5d4a57606468f40db71d668 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,7 @@ David Lawrence Ramsey <pooka109@cox.net>
 	  wrapping code, spelling fixes, const mode, parts of the UTF-8
 	  support, and various other fixes.
 
-Jordi Mallach <jordi@sindominio.net>
+Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
 	* Internationalization support head, ca.po maintainer.
 
diff --git a/ChangeLog b/ChangeLog
index 8a32343f140987701cb96212445de7dca9c3f9b6..1785ce31ee9e2ff10d2e9a69dd53106b65ccac80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,10 @@ CVS code -
 	  and do_down_void(); changes to shortcut_init(), do_up(),
 	  do_scroll_up(), do_down(), do_scroll_down(), do_left(), and
 	  do_right(). (DLR)
+	- Make Jordi's email address, and the description of what the
+	  manual pages were written for, consistent in the
+	  documentation.  Changes to AUTHORS, nano.1, nanorc.5, and
+	  rnano.1. (DLR, based on suggestions by Jordi)
 - browser.c:
   do_browser()
 	- Refactor the mouse support, modeling it after do_mouse() for
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 7bfe114d88db188474105ed67c441ace29fae834..31ee1ac86835835244d755670090f1b38eec8e69 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -7,7 +7,7 @@
 .\" warranty.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.9.99pre1" "June 26, 2006"
+.TH NANO 1 "version 1.9.99pre1" "July 12, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -230,5 +230,5 @@ http://www.nano-editor.org/
 .SH AUTHOR
 Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
 \fITHANKS\fP for details).  This manual page was originally written by
-Jordi Mallach <jordi@sindominio.net>, for the Debian GNU system (but may
-be used by others).
+Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
+others).
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 948adf5bef4cc39637d4a545fbe56ed377114ad9..70893817cfbd7119d1f6c988c368f554cdfb19f3 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -7,7 +7,7 @@
 .\" warranty.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.9.99pre1" "June 26, 2006"
+.TH NANORC 5 "version 1.9.99pre1" "July 12, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -254,5 +254,6 @@ Per-user configuration file
 system)
 .SH AUTHOR
 Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
-\fITHANKS\fP for details).  This manual page was written by Jordi
-Mallach <jordi@gnu.org>.
+\fITHANKS\fP for details).  This manual page was originally written by
+Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
+others).
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 457f74191ecb1394e643033797868933f323f5dd..6f60ab2caa8bc2ae6cef14224311524a49e9c231 100644
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -1,14 +1,14 @@
 .\" Hey, EMACS: -*- nroff -*-
 .\" rnano.1 is Copyright 2005, 2006 by Thijs Kinkhorst
 .\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1 by Jordi
-.\" Mallach <jordi@debian.org>.
+.\" Mallach <jordi@gnu.org>.
 .\"
 .\" This is free documentation, see the latest version of the GNU
 .\" General Public License for copying conditions.  There is NO
 .\" warranty.
 .\"
 .\" $Id$
-.TH RNANO 1 "version 1.9.99pre1" "June 26, 2006"
+.TH RNANO 1 "version 1.9.99pre1" "July 12, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME