Index: boot/mips64-64/colo-build.xml
===================================================================
--- boot/mips64-64/colo-build.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ boot/mips64-64/colo-build.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -18,26 +18,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/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="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/mips/colo.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/mips64-64/colo.xml
===================================================================
--- final-system/mips64-64/colo.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/colo.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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-64/file.xml
===================================================================
--- final-system/mips64-64/file.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/file.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/mips64-64/flex.xml
===================================================================
--- final-system/mips64-64/flex.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/flex.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/mips64-64/gcc.xml
===================================================================
--- final-system/mips64-64/gcc.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/gcc.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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-64/glibc.xml
===================================================================
--- final-system/mips64-64/glibc.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/glibc.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/mips64-64/linux-libc-headers.xml
===================================================================
--- final-system/mips64-64/linux-libc-headers.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/linux-libc-headers.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/mips64-64/make.xml
===================================================================
--- final-system/mips64-64/make.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/make.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.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/make.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </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/mips64-64/mktemp.xml
===================================================================
--- final-system/mips64-64/mktemp.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/mktemp.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/mips64-64/module-init-tools.xml
===================================================================
--- final-system/mips64-64/module-init-tools.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/mips64-64/module-init-tools.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/sparc64-64/binutils.xml
===================================================================
--- final-system/sparc64-64/binutils.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/sparc64-64/binutils.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/sparc64-64/glibc.xml
===================================================================
--- final-system/sparc64-64/glibc.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/sparc64-64/glibc.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/sparc64-64/linux-libc-headers.xml
===================================================================
--- final-system/sparc64-64/linux-libc-headers.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/sparc64-64/linux-libc-headers.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/x86/coreutils.xml
===================================================================
--- final-system/x86/coreutils.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86/coreutils.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.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/coreutils.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/coreutils.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/x86/grub.xml
===================================================================
--- final-system/x86/grub.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86/grub.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -20,14 +20,4 @@
 
     <para>The GRUB package contains the GRand Unified Bootloader.</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/x86/linux-libc-headers.xml
===================================================================
--- final-system/x86/linux-libc-headers.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86/linux-libc-headers.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -22,14 +22,4 @@
     <para>The Linux-Libc-Headers package contains the
     <quote>sanitized</quote> kernel headers.</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/x86_64-64/gettext.xml
===================================================================
--- final-system/x86_64-64/gettext.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64-64/gettext.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.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/gettext.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gettext.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/x86_64-64/glibc.xml
===================================================================
--- final-system/x86_64-64/glibc.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64-64/glibc.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/x86_64-64/grub.xml
===================================================================
--- final-system/x86_64-64/grub.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64-64/grub.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -16,26 +16,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.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/grub.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/grub.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/x86_64-64/linux-libc-headers.xml
===================================================================
--- final-system/x86_64-64/linux-libc-headers.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64-64/linux-libc-headers.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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/x86_64/coreutils.xml
===================================================================
--- final-system/x86_64/coreutils.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64/coreutils.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.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/coreutils.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/coreutils.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/x86_64/gettext-64bit.xml
===================================================================
--- final-system/x86_64/gettext-64bit.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64/gettext-64bit.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -17,26 +17,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.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/gettext.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gettext.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/x86_64/grub.xml
===================================================================
--- final-system/x86_64/grub.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64/grub.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -16,26 +16,7 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.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/grub.xml"
-    xpointer="xpointer(//*[@role='package']/segmentedlist[2])"/>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/grub.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
Index: final-system/x86_64/linux-libc-headers.xml
===================================================================
--- final-system/x86_64/linux-libc-headers.xml	(revision 0877a18db860780109507540949621c3a8f108b8)
+++ final-system/x86_64/linux-libc-headers.xml	(revision 1bb70b110a0c860dc5f50d4550f42cd5c6de963f)
@@ -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">
