diff --git a/AUTHORS b/AUTHORS
index eb1f7673b2d8090b978d54a45be201f902b9505f..3d06a64443ee28c495ac4c9425f0c86461705f93 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,7 +6,7 @@ nano editor.  Please see the ChangeLog for specific changes by author.
 Chris Allegretta <chrisa@asty.org>
 	* Original program author, former stable series maintainer.
 
-David Lawrence Ramsey <pooka109@cox.net>
+David Lawrence Ramsey <pooka109@gmail.com>
 	* Current stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
 	  wrapping code, spelling fixes, const mode, parts of the UTF-8
diff --git a/ChangeLog b/ChangeLog
index fc7b253e67bc937ad8276d29becdc1a5ad7e78a6..df92a58057d02bc8eefa09154ee949781eb7a6a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-04  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* AUTHORS, faq.html: Update email address.
+
 2007-02-01  Benno Schulenberg  <bensberg@justemail.net>
 
 	* global.c (shortcut_init): Reword the movement shortcut
diff --git a/doc/faq.html b/doc/faq.html
index 7d99a286beb318c9e06f969bf828833d0125dfab..93d7b0bf70d4865be3b7b05f91b5da0330a107e9 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -66,7 +66,7 @@
 <hr width="100%">
 <h1><a name="1"></a>1. General</h1>
 <h2><a name="1.1"></a>1.1 About this FAQ</h2>
-<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It is currently maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@cox.net">pooka109@cox.net</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
+<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It is currently maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@gmail.com">pooka109@gmail.com</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
 <h2><a name="1.2"></a>1.2. How do I contribute to it?</h2>
 <blockquote><p>Your best bet is to send it to the nano email address, <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a> and if it is useful enough it will be included in future versions.</p></blockquote>
 <h2><a name="1.3"></a>1.3. What is GNU nano?</h2>
@@ -256,7 +256,8 @@
 <h2><a name="7.5"></a>7.5. Can I have CVS write access?</h2>
 <blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <h2><a name="8"></a>8. ChangeLog</h2>
-<blockquote><p>2007/01/01 - Update section 4.1 to describe how to open files with names beginning with '+' at specified columns as well as lines. (DLR)<br>
+<blockquote><p>2007/04/04 - Update email address. (DLR)<br>
+2007/01/01 - Update section 4.1 to describe how to open files with names beginning with '+' at specified columns as well as lines. (DLR)<br>
 2006/11/25 - Add miscellaneous wording and capitalization fixes. (DLR)<br>
 2006/10/28 - Update various links for the 2.0 branch of nano. (DLR)<br>
 2006/10/06 - Update the question in section 4.13 to match the version of it in the answer section. (DLR)<br>