diff --git a/chapter01/resources.xml b/chapter01/resources.xml
index de67308ff..6588b937d 100644
--- a/chapter01/resources.xml
+++ b/chapter01/resources.xml
@@ -35,7 +35,8 @@
 
   </sect2>
 
-  <!-- Remove until such time as we have our own News Server, JH 20060105
+  <!-- FIXME: Remove until such time as we have our own News Server, JH 20060105
+
   <sect2 id="ch-intro-newsserver">
     <title>News Server</title>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 8147fe85a..452990367 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -423,7 +423,7 @@
       </listitem>
     </varlistentry>
 
-    <!--
+    <!-- FIXME:
     <varlistentry>
       <term>Ncurses Rollup Patch (&ncurses-date;) - 328 KB:</term>
       <listitem>
diff --git a/chapter05/toolchaintechnotes.xml b/chapter05/toolchaintechnotes.xml
index 8eabbbd17..394a4f4a5 100644
--- a/chapter05/toolchaintechnotes.xml
+++ b/chapter05/toolchaintechnotes.xml
@@ -167,10 +167,10 @@ checking what linker to use... /tools/i686-pc-linux-gnu/bin/ld</computeroutput><
   toolchain defaults, then proceed in building the rest of the target
   LFS system.</para>
 
-  <!-- Removed as part of the fix for bug 1061 - we no longer build pass1
-      packages statically, therefore this explanation isn't required -->
+  <!-- FIXME: Removed as part of the fix for bug 1061 - we no longer build pass1
+      packages statically, therefore this explanation isn't required
 
-  <!--<sect2>
+  <sect2>
   <title>Notes on Static Linking</title>
 
   <para>Besides their specific task, most programs have to perform many
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 3a123d982..9ef0ae6ec 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -222,7 +222,8 @@ install -m755 convert-mans  /usr/bin</userinput></screen>
             <entry>Dutch (nl)</entry>
             <entry>ISO-8859-1</entry>
           </row>
-          <!-- BUG: "no" is deprecated, should use "nb" or "nn" and symlinks -->
+	  <!-- FIXME: BUG: "no" is deprecated, should use "nb" or "nn" and
+          symlinks -->
           <row>
             <entry>Norwegian (no)</entry>
             <entry>ISO-8859-1</entry>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 71567db19..bb0839c8c 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -34,7 +34,9 @@
 
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-    <!-- Uncomment if using a dated ncurses release instead of a numbered one.
+
+    <!-- FIXME: Uncomment if using a dated ncurses release instead of a numbered
+         one.
 
     <para>Since the release of Ncurses-&ncurses-version;, some bugs have been fixed
     and features added. The most important news are .......