Index: final-system/64/binutils.xml
===================================================================
--- final-system/64/binutils.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/64/binutils.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/binutils.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/64/gcc.xml
===================================================================
--- final-system/64/gcc.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/64/gcc.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/64/glibc.xml
===================================================================
--- final-system/64/glibc.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/64/glibc.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/alpha/aboot.xml
===================================================================
--- final-system/alpha/aboot.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/alpha/aboot.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -21,14 +21,4 @@
 
     <para>The aboot package contains the Alpha Bootloder.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
 
     <segmentedlist>
Index: final-system/alpha/linux-libc-headers.xml
===================================================================
--- final-system/alpha/linux-libc-headers.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/alpha/linux-libc-headers.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/colo.xml
===================================================================
--- final-system/mips/colo.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/colo.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -21,14 +21,4 @@
 
     <para>The Colo package contains the Cobalt Boot Loader.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
 
     <segmentedlist>
Index: final-system/mips/file.xml
===================================================================
--- final-system/mips/file.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/file.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/file.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/flex.xml
===================================================================
--- final-system/mips/flex.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/flex.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,30 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <para>The Flex package contains a utility for generating programs that
-    recognize patterns in text.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Bison, Coreutils, Diffutils,
-        GCC, Gettext, Glibc, Grep, M4, Make, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/gcc.xml
===================================================================
--- final-system/mips/gcc.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/gcc.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/glibc.xml
===================================================================
--- final-system/mips/glibc.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/glibc.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/grep.xml
===================================================================
--- final-system/mips/grep.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/grep.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/grep.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/linux-libc-headers.xml
===================================================================
--- final-system/mips/linux-libc-headers.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/linux-libc-headers.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/make.xml
===================================================================
--- final-system/mips/make.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/make.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,29 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <para>The Make package contains a program for compiling packages.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext,
-        Glibc, Grep, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/make.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/mktemp.xml
===================================================================
--- final-system/mips/mktemp.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/mktemp.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/mktemp.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/module-init-tools.xml
===================================================================
--- final-system/mips/module-init-tools.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/module-init-tools.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/module-init-tools.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/procps.xml
===================================================================
--- final-system/mips/procps.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/procps.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/procps.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips/sysvinit.xml
===================================================================
--- final-system/mips/sysvinit.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips/sysvinit.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64/colo.xml
===================================================================
--- final-system/mips64/colo.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/colo.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64/file-64bit.xml
===================================================================
--- final-system/mips64/file-64bit.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/file-64bit.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,40 +17,21 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/file.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
     <title>Installation of File</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
     <para>Prepare File for compilation:</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
@@ -59,20 +40,20 @@
    --libdir=/usr/lib64</userinput></screen>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='c'])"/>
     <para>Prepare File for compilation:</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <para>Prepare File for compilation:</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='e'])"/>
     <para>Prepare File for compilation:</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='f'])"/>
Index: final-system/mips64/file-n32.xml
===================================================================
--- final-system/mips64/file-n32.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/file-n32.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -18,39 +18,20 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/file.xml"
+  xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
 
   <sect2 role="installation">
     <title>Installation of File</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
@@ -59,18 +40,18 @@
    --libdir=/usr/lib32</userinput></screen>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='d'])"/>
     <para>Compile the package:</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="file.xml"
     xpointer="xpointer(//*[@os='f'])"/>
Index: final-system/mips64/file.xml
===================================================================
--- final-system/mips64/file.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/file.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -18,39 +18,20 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+    xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
     <title>Installation of File</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/file.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/file.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
@@ -58,17 +39,17 @@
 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='f'])"/>
Index: final-system/mips64/flex-64bit.xml
===================================================================
--- final-system/mips64/flex-64bit.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/flex-64bit.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64/flex-n32.xml
===================================================================
--- final-system/mips64/flex-n32.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/flex-n32.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,87 +17,64 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <para>The Flex package contains a utility for generating programs that
-    recognize patterns in text.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Bison, Coreutils, Diffutils,
-        GCC, Gettext, Glibc, Grep, M4, Make, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/flex-n32.xml"
     xpointer="xpointer(//*[@os='m3'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/flex-n32.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/flex-n32.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
-</sect2>
+  </sect2>
 
   <sect2 role="content">
Index: final-system/mips64/flex.xml
===================================================================
--- final-system/mips64/flex.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/flex.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,87 +17,64 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <para>The Flex package contains a utility for generating programs that
-    recognize patterns in text.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Bison, Coreutils, Diffutils,
-        GCC, Gettext, Glibc, Grep, M4, Make, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/flex.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/flex.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/flex.xml"
     xpointer="xpointer(//*[@os='m1'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/flex.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
-</sect2>
+  </sect2>
 
   <sect2 role="content">
Index: final-system/mips64/gcc.xml
===================================================================
--- final-system/mips64/gcc.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/gcc.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64/glibc-64bit.xml
===================================================================
--- final-system/mips64/glibc-64bit.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/glibc-64bit.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64/glibc-n32.xml
===================================================================
--- final-system/mips64/glibc-n32.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/glibc-n32.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64/glibc.xml
===================================================================
--- final-system/mips64/glibc.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/glibc.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -18,26 +18,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64/grep.xml
===================================================================
--- final-system/mips64/grep.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/grep.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/grep.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
@@ -79,5 +60,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-</sect2>
+  </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64/linux-libc-headers.xml
===================================================================
--- final-system/mips64/linux-libc-headers.xml	(revision 762c41427f0d439c66d8b3bcfa7b0a8d3c0f1977)
+++ final-system/mips64/linux-libc-headers.xml	(revision 65d82b0f40d84080176ba46442b9dec2e897b2eb)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>Not checked yet</seg>
-        <seg>Not checked yet</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/linux-libc-headers.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/linux-libc-headers.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
