diff --git a/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt b/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt
index 81639c46..f43dba84 100644
--- a/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt
+++ b/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt
@@ -4,7 +4,7 @@
     <firstname>David</firstname>
     <othername>C.</othername>
     <surname>Merrill</surname>
-      <affiliation><address><email>dmerrill@ibiblio.org</email></address></affiliation>
+      <affiliation><address><email>david@lupercalia.net</email></address></affiliation>
   </author>
   <authorinitials>dcm</authorinitials>
 
@@ -34,6 +34,12 @@
       <authorinitials>dcm</authorinitials>
       <revremark>Minor corrections.</revremark>
     </revision>
+    <revision>
+      <revnumber>2.1.2</revnumber>
+      <date>2004-02-28</date>
+      <authorinitials>dcm</authorinitials>
+      <revremark>Minor corrections.</revremark>
+    </revision>
   </revhistory>
 
   <abstract>
@@ -75,11 +81,13 @@ The latest versions are available from the
 [[http://tldp.org|Linux Documentation Project]].
 
 
-==Where To Send Comments|feedback-is-invited==
+==Asking Questions and Sending Comments|feedback==
 
 If you have any comments, or if you have a question about Linux that was not
 answered here, feel free to send it to the maintainer:
-[[mailto:dmerrill@ibiblio.org|David Merrill]].
+[[mailto:david@lupercalia.net|David Merrill]].
+'''Place the letters FAQ in the subject of your message.'''
+
 I won't guarantee to answer all questions, but I'll answer as many as I can.
 Questions that I receive repeatedly will be added to the FAQ.
 If you wish to refer to a question in the FAQ, please
@@ -92,8 +100,8 @@ Context diff is not my first language.
 
 ==Authorship and Acknowledgments|authorship-and-acknowledgments==
 
-This FAQ is currently compiled and maintained by David Merrill, 
-[[mailto:dmerrill@ibiblio.org]], with assistance and comments from Linux users
+This FAQ is currently compiled and maintained by David Merrill,
+with assistance and comments from Linux users
 all over the world.
 Over the years it has passed through several hands, and I'd like to
 recognize all the folks who have worked on it.
@@ -1389,9 +1397,9 @@ for you and easier on the network.
 /*
 
 Please send updates and corrections to this list to the Linux FAQ maintainer,
-[[mailto:dmerrill@ibiblio.org]] Not all of these mirror
-all of the other "source" sites, and some have material not available on
-the "source" sites.
+see [[link:feedback]].
+Not all of these mirror all of the other "source" sites,
+and some have material not available on the "source" sites.
 
 
 Q: How Do I Install Linux Using FTP?|install-linux-using-ftp
@@ -4855,7 +4863,7 @@ updated software for Linux and other free OS's.
 /*
 
 Please send additions to this list to the FAQ
-maintainer, David Merrill, [[mailto:dmerrill@ibiblio.org]].
+maintainer, see [[link:feedback]].
 
 
 Q: Where Can I To Find Information About Security Related Issues?|about-security-related-issues
@@ -4884,7 +4892,7 @@ worth spending some of your time to read and follow these
 instructions?
 
 If you think an answer is incomplete or inaccurate, please e-mail
-David Merrill at [[mailto:dmerrill@ibiblio.org]].
+David Merrill. See [[link:feedback]].
 
 Read the appropriate Linux Documentation Project books.
 Refer to [[link:howtos-and-other-documentation]].