diff --git a/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt b/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt
index 64a5f761..df3557b5 100644
--- a/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt
+++ b/LDP/faq/wikitext/Linux-FAQ/Linux-FAQ.wt
@@ -1,14 +1,15 @@
 <articleinfo>
-  <title>Linux Frequently Asked Questions with Answers</title>
+  <title>The Linux FAQ</title>
   <author>
     <firstname>David</firstname>
     <othername>C.</othername>
     <surname>Merrill</surname>
+      <affiliation><address><email>dmerrill@ibiblio.org</email></address></affiliation>
   </author>
   <authorinitials>dcm</authorinitials>
 
-  <pubdate>2002-04-25</pubdate>
-  <version>2.0</version>
+  <pubdate>2003-05-19</pubdate>
+  <version>2.0.1</version>
   <revhistory>
     <revision>
       <revnumber>1.20</revnumber>
@@ -21,6 +22,12 @@
       <authorinitials>dcm</authorinitials>
       <revremark>Some reorganization and markup changes.</revremark>
     </revision>
+    <revision>
+      <revnumber>2.0.1</revnumber>
+      <date>2003-05-19</date>
+      <authorinitials>dcm</authorinitials>
+      <revremark>Some text cleanup and conversion to WikiText.</revremark>
+    </revision>
   </revhistory>
 
   <abstract>
@@ -853,7 +860,7 @@ for you and easier on the network.
 /*
 
 Please send updates and corrections to this list to the Linux FAQ maintainer,
-[[mailto:david@lupercalia.net]] Not all of these mirror
+[[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.
 
@@ -3683,7 +3690,7 @@ updated software for Linux and other free OS's.
 /*
 
 Please send additions to this list to the FAQ
-maintainer, David Merrill, [[mailto:david@lupercalia.net]].
+maintainer, David Merrill, [[mailto:dmerrill@ibiblio.org]].
 
 Q: How Many People Use Linux?|how-many-people
 
@@ -4397,7 +4404,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:david@lupercalia.net]].
+David Merrill at [[mailto:dmerrill@ibiblio.org]].
 
 Read the appropriate Linux Documentation Project books.
 Refer to [[link:howtos-and-other-documentation]].
@@ -4544,7 +4551,7 @@ right to expect an answer.
 ==Where To Send Comments|feedback-is-invited==
 
 Please send comments to the maintainer:
-[[mailto:david@lupercalia.net|David Merrill]].
+[[mailto:dmerrill@ibiblio.org|David Merrill]].
 
 Contributions to the FAQ may be in any format.
 Comments and corrections are gratefully received.
@@ -4577,7 +4584,7 @@ Linux Documentation Project at
 ==Authorship and Acknowledgments|authorship-and-acknowledgments==
 
 This FAQ is compiled and maintained by David Merrill, 
-[[mailto:david@lupercalia.net]], with assistance and comments from Linux activists all over the world.
+[[mailto:dmerrill@ibiblio.org]], with assistance and comments from Linux activists all over the world.
 
 It was maintained by Robert Kiesling until January, 2002