diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh
index 828a2b6..916ea6d 100755
--- a/BLFS/gen-special.sh
+++ b/BLFS/gen-special.sh
@@ -78,8 +78,13 @@ cat >$SPECIAL_FILE << EOF
         <xsl:text>&#xA;      </xsl:text>
       </package><xsl:text>&#xA;</xsl:text>
     </xsl:when>
-<!-- Although versioned, this page is not a package -->
-    <xsl:when test="@id='xorg7'"/>
+<!-- Although versioned, this page is not a package. But
+     the sect2 with id "xorg-env" is referred to at several
+     places in the book. We have added it to the list of non
+     versioned packages. -->
+    <xsl:when test="@id='xorg7'">
+      <xsl:apply-templates select="child::sect2" mode="special"/>
+    </xsl:when>
 EOF
 
 # Non-versionned packages. Add to NV_LIST if you need more.
diff --git a/BLFS/xsl/dependencies.xsl b/BLFS/xsl/dependencies.xsl
index 39907a1..9146468 100644
--- a/BLFS/xsl/dependencies.xsl
+++ b/BLFS/xsl/dependencies.xsl
@@ -55,7 +55,6 @@
     <xsl:param name="priority"/>
     <xsl:variable name="depname">
       <xsl:choose>
-        <xsl:when test="@name='xorg-env'"/>
         <xsl:when test="@name='x-window-system'">xinit</xsl:when>
         <xsl:when test="@name='xorg7'">xinit</xsl:when>
         <xsl:when test="@name='server-mail'">
diff --git a/BLFS/xsl/gen_pkg_list.xsl b/BLFS/xsl/gen_pkg_list.xsl
index 18f0a28..345e160 100644
--- a/BLFS/xsl/gen_pkg_list.xsl
+++ b/BLFS/xsl/gen_pkg_list.xsl
@@ -64,7 +64,7 @@
           <xsl:value-of select="title"/>
         </xsl:element>
         <xsl:text>&#xA;</xsl:text>
-        <xsl:apply-templates select=".//sect1[@xreflabel]">
+        <xsl:apply-templates select=".//sect1">
           <xsl:sort select="@id"/>
         </xsl:apply-templates>
       <xsl:text>    </xsl:text>
@@ -92,17 +92,14 @@
             <xsl:value-of select="title"/>
             </xsl:element>
           <xsl:text>&#xA;</xsl:text>
-<!-- Do not use .//*, which would include self.
-     Calls the template of specialCases.xsl,
-     which calls the "normal" template when the
-     case is normal. -->
+<!-- Do not use .//*, which would include self. -->
           <xsl:apply-templates
             select="descendant::node()[contains(translate(@xreflabel,
                                                          '123456789',
                                                          '000000000'),
                                                 '-0')    
                                       ]"
-            mode="special">
+            mode="normal">
             <xsl:sort select="@id"/>
           </xsl:apply-templates>
           <xsl:text>      </xsl:text>