diff --git a/chapter01/administrativa.xml b/chapter01/administrativa.xml
index 3d927c82f..261beb214 100644
--- a/chapter01/administrativa.xml
+++ b/chapter01/administrativa.xml
@@ -52,15 +52,6 @@ FAQ or the mailing list archives. You can find the IRC network at
The support channel is named #LFS-support.
-
-Wiki
-
-For more information on packages, updated versions, tweaks, and
-personal experiences, see the LFS Wiki at .
-Users can also add information there to help others with their future
-LFS activities.
-
-
References
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 77f75adfe..86aa03122 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -91,6 +91,9 @@ First a summary, then a detailed log.
+July 5th, 2005 [archaic]: Removed reference to the wiki.
+Pointed to the FAQ.
+
July 4th, 2005 [archaic]: Reworded errata page so it only
refers to security warnings and bug fixes, not new features.
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index e544f6334..098c4223b 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -55,7 +55,7 @@ Ask your system administrator to create more.
If the above message is received, the host does not have its
PTYs set up properly. In this case, there is no point in running the
test suites for GCC and Binutils until this issue is resolved. Please
-consult the LFS Wiki at for more
+consult the LFS FAQ at for more
information on how to get PTYs working.
First correct a known problem and make an essential adjustment:
diff --git a/general.ent b/general.ent
index 3f853d96c..9256b59ea 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+
@@ -10,8 +10,13 @@
-
+