diff --git a/appendixa/autoconf-shortdesc.xml b/appendixa/autoconf-shortdesc.xml
index 8826aeea2..ea7286a1a 100644
--- a/appendixa/autoconf-shortdesc.xml
+++ b/appendixa/autoconf-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Autoconf</title>
+<sect2 id="contents-autoconf"><title>Contents of Autoconf</title>
 
 <!-- <para>(Last checked against version &autoconf-contversion;.)</para> -->
 
diff --git a/appendixa/automake-shortdesc.xml b/appendixa/automake-shortdesc.xml
index b81651a01..15e0877d1 100644
--- a/appendixa/automake-shortdesc.xml
+++ b/appendixa/automake-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Automake</title>
+<sect2 id="contents-automake"><title>Contents of Automake</title>
 
 <!-- <para>(Last checked against version &automake-contversion;.)</para> -->
 
diff --git a/appendixa/bash-shortdesc.xml b/appendixa/bash-shortdesc.xml
index ec8aac8e9..68d86e2fd 100644
--- a/appendixa/bash-shortdesc.xml
+++ b/appendixa/bash-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Bash</title>
+<sect2 id="contents-bash"><title>Contents of Bash</title>
 
 <!-- <para>(Last checked against version &bash-contversion;.)</para> -->
 
diff --git a/appendixa/binutils-shortdesc.xml b/appendixa/binutils-shortdesc.xml
index 23635f982..e4a69ad96 100644
--- a/appendixa/binutils-shortdesc.xml
+++ b/appendixa/binutils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Binutils</title>
+<sect2 id="contents-binutils"><title>Contents of Binutils</title>
 
 <!-- <para>(Last checked against version &binutils-contversion;.)</para> -->
 
diff --git a/appendixa/bison-shortdesc.xml b/appendixa/bison-shortdesc.xml
index 6bd85e328..3930245fb 100644
--- a/appendixa/bison-shortdesc.xml
+++ b/appendixa/bison-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Bison</title>
+<sect2 id="contents-bison"><title>Contents of Bison</title>
 
 <!-- <para>(Last checked against version &bison-contversion;.)</para> -->
 
diff --git a/appendixa/bootscripts-shortdesc.xml b/appendixa/bootscripts-shortdesc.xml
index aad9081df..15f14b82c 100644
--- a/appendixa/bootscripts-shortdesc.xml
+++ b/appendixa/bootscripts-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of LFS-bootscripts</title>
+<sect2 id="contents-bootscripts"><title>Contents of LFS-bootscripts</title>
 
 <!-- <para>(Last checked against version &bootscripts-contversion;.)</para> -->
 
diff --git a/appendixa/bzip2-shortdesc.xml b/appendixa/bzip2-shortdesc.xml
index b00477155..596c6e27c 100644
--- a/appendixa/bzip2-shortdesc.xml
+++ b/appendixa/bzip2-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Bzip2</title>
+<sect2 id="contents-bzip2"><title>Contents of Bzip2</title>
 
 <!-- <para>(Last checked against version &bzip2-contversion;.)</para> -->
 
diff --git a/appendixa/coreutils-shortdesc.xml b/appendixa/coreutils-shortdesc.xml
index 0fba0d93d..375ecc103 100644
--- a/appendixa/coreutils-shortdesc.xml
+++ b/appendixa/coreutils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Coreutils</title>
+<sect2 id="contents-coreutils"><title>Contents of Coreutils</title>
 
 <para>The Coreutils package contains a whole series of basic shell utilities.</para>
 
diff --git a/appendixa/dejagnu-shortdesc.xml b/appendixa/dejagnu-shortdesc.xml
index b6ca52fa3..733951c6c 100644
--- a/appendixa/dejagnu-shortdesc.xml
+++ b/appendixa/dejagnu-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of DejaGnu</title>
+<sect2 id="contents-dejagnu"><title>Contents of DejaGnu</title>
 
 <!-- <para>(Last checked against version &dejagnu-contversion;.)</para> -->
 
diff --git a/appendixa/dejagnu.xml b/appendixa/dejagnu.xml
index 59cadabcb..ac41bfbf6 100644
--- a/appendixa/dejagnu.xml
+++ b/appendixa/dejagnu.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch05-dejagnu"/>.</para>
 
 &aa-dejagnu-down;
-&aa-dejagnu-shortdesc;
-&aa-dejagnu-desc;
 &aa-dejagnu-dep;
 
 </sect1>
diff --git a/appendixa/diffutils-shortdesc.xml b/appendixa/diffutils-shortdesc.xml
index 17d3de727..4d1a97659 100644
--- a/appendixa/diffutils-shortdesc.xml
+++ b/appendixa/diffutils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Diffutils</title>
+<sect2 id="contents-diffutils"><title>Contents of Diffutils</title>
 
 <!-- <para>(Last checked against version &diffutils-contversion;.)</para> -->
 
diff --git a/appendixa/e2fsprogs-shortdesc.xml b/appendixa/e2fsprogs-shortdesc.xml
index 219886aca..864d075ac 100644
--- a/appendixa/e2fsprogs-shortdesc.xml
+++ b/appendixa/e2fsprogs-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of E2fsprogs</title>
+<sect2 id="contents-e2fsprogs"><title>Contents of E2fsprogs</title>
 
 <!-- <para>(Last checked against version &e2fsprogs-contversion;.)</para> -->
 
diff --git a/appendixa/ed-shortdesc.xml b/appendixa/ed-shortdesc.xml
index ab7992050..d91675c78 100644
--- a/appendixa/ed-shortdesc.xml
+++ b/appendixa/ed-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Ed</title>
+<sect2 id="contents-ed"><title>Contents of Ed</title>
 
 <!-- <para>(Last checked against version &ed-contversion;.)</para> -->
 
diff --git a/appendixa/expect-shortdesc.xml b/appendixa/expect-shortdesc.xml
index faf6f6b0b..0c0392d77 100644
--- a/appendixa/expect-shortdesc.xml
+++ b/appendixa/expect-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Expect</title>
+<sect2 id="contents-expect"><title>Contents of Expect</title>
 
 <!-- <para>(Last checked against version &expect-contversion;.)</para> -->
 
diff --git a/appendixa/expect.xml b/appendixa/expect.xml
index 661a5c1ec..d49b8947c 100644
--- a/appendixa/expect.xml
+++ b/appendixa/expect.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch05-expect"/>.</para>
 
 &aa-expect-down;
-&aa-expect-shortdesc;
-&aa-expect-desc;
 &aa-expect-dep;
 
 </sect1>
diff --git a/appendixa/file-shortdesc.xml b/appendixa/file-shortdesc.xml
index 7b8c70fa5..11e305044 100644
--- a/appendixa/file-shortdesc.xml
+++ b/appendixa/file-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of File</title>
+<sect2 id="contents-file"><title>Contents of File</title>
 
 <!-- <para>(Last checked against version &file-contversion;.)</para> -->
 
diff --git a/appendixa/findutils-shortdesc.xml b/appendixa/findutils-shortdesc.xml
index 594edfd7c..cf9bba98a 100644
--- a/appendixa/findutils-shortdesc.xml
+++ b/appendixa/findutils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Findutils</title>
+<sect2 id="contents-findutils"><title>Contents of Findutils</title>
 
 <!-- <para>(Last checked against version &findutils-contversion;.)</para> -->
 
diff --git a/appendixa/flex-shortdesc.xml b/appendixa/flex-shortdesc.xml
index df31f0ffd..8ef6b4deb 100644
--- a/appendixa/flex-shortdesc.xml
+++ b/appendixa/flex-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Flex</title>
+<sect2 id="contents-flex"><title>Contents of Flex</title>
 
 <!-- <para>(Last checked against version &flex-contversion;.)</para> -->
 
diff --git a/appendixa/gawk-shortdesc.xml b/appendixa/gawk-shortdesc.xml
index dacf494cc..189531790 100644
--- a/appendixa/gawk-shortdesc.xml
+++ b/appendixa/gawk-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Gawk</title>
+<sect2 id="contents-gawk"><title>Contents of Gawk</title>
 
 <!-- <para>(Last checked against version &gawk-contversion;.)</para> -->
 
diff --git a/appendixa/gcc-shortdesc.xml b/appendixa/gcc-shortdesc.xml
index a2eb92932..6d371370a 100644
--- a/appendixa/gcc-shortdesc.xml
+++ b/appendixa/gcc-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of GCC</title>
+<sect2 id="contents-gcc"><title>Contents of GCC</title>
 
 <!-- <para>(Last checked against version &gcc-contversion;.)</para> -->
 
diff --git a/appendixa/gettext-shortdesc.xml b/appendixa/gettext-shortdesc.xml
index 07dfd694b..44d4c262a 100644
--- a/appendixa/gettext-shortdesc.xml
+++ b/appendixa/gettext-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Gettext</title>
+<sect2 id="contents-gettext"><title>Contents of Gettext</title>
 
 <!-- <para>(Last checked against version &gettext-contversion;.)</para> -->
 
diff --git a/appendixa/glibc-shortdesc.xml b/appendixa/glibc-shortdesc.xml
index bee9a145c..d54606dbb 100644
--- a/appendixa/glibc-shortdesc.xml
+++ b/appendixa/glibc-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Glibc</title>
+<sect2 id="contents-glibc"><title>Contents of Glibc</title>
 
 <!-- <para>(Last checked against version &glibc-contversion;.)</para> -->
 
diff --git a/appendixa/grep-shortdesc.xml b/appendixa/grep-shortdesc.xml
index 257d16c97..4119f6d1b 100644
--- a/appendixa/grep-shortdesc.xml
+++ b/appendixa/grep-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Grep</title>
+<sect2 id="contents-grep"><title>Contents of Grep</title>
 
 <!-- <para>(Last checked against version &grep-contversion;.)</para> -->
 
diff --git a/appendixa/groff-shortdesc.xml b/appendixa/groff-shortdesc.xml
index 160994e98..0680fefd0 100644
--- a/appendixa/groff-shortdesc.xml
+++ b/appendixa/groff-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Groff</title>
+<sect2 id="contents-groff"><title>Contents of Groff</title>
 
 <!-- <para>(Last checked against version &groff-contversion;.)</para> -->
 
diff --git a/appendixa/grub-shortdesc.xml b/appendixa/grub-shortdesc.xml
index cbe9eb8e9..1aaf8550c 100644
--- a/appendixa/grub-shortdesc.xml
+++ b/appendixa/grub-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Grub</title>
+<sect2 id="contents-grub"><title>Contents of Grub</title>
 
 <!-- <para>(Last checked against version &grub-contversion;.)</para> -->
 
diff --git a/appendixa/gzip-shortdesc.xml b/appendixa/gzip-shortdesc.xml
index 1f1ae2a9a..816c31ec1 100644
--- a/appendixa/gzip-shortdesc.xml
+++ b/appendixa/gzip-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Gzip</title>
+<sect2 id="contents-gzip"><title>Contents of Gzip</title>
 
 <!-- <para>(Last checked against version &gzip-contversion;.)</para> -->
 
diff --git a/appendixa/inetutils-shortdesc.xml b/appendixa/inetutils-shortdesc.xml
index af921f4ed..1887bc575 100644
--- a/appendixa/inetutils-shortdesc.xml
+++ b/appendixa/inetutils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Inetutils</title>
+<sect2 id="contents-inetutils"><title>Contents of Inetutils</title>
 
 <!-- <para>(Last checked against version &inetutils-contversion;.)</para> -->
 
diff --git a/appendixa/kbd-shortdesc.xml b/appendixa/kbd-shortdesc.xml
index 014179a71..d40df6921 100644
--- a/appendixa/kbd-shortdesc.xml
+++ b/appendixa/kbd-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Kbd</title>
+<sect2 id="contents-kbd"><title>Contents of Kbd</title>
 
 <!-- <para>(Last checked against version &kbd-contversion;.)</para> -->
 
diff --git a/appendixa/kernel-shortdesc.xml b/appendixa/kernel-shortdesc.xml
index e9b64cc42..e97bcb57c 100644
--- a/appendixa/kernel-shortdesc.xml
+++ b/appendixa/kernel-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Linux</title>
+<sect2 id="contents-kernel"><title>Contents of Linux</title>
 
 <!-- <para>(Last checked against version &kernel-contversion;.)</para> -->
 
diff --git a/appendixa/kernel.xml b/appendixa/kernel.xml
index f0cf82c21..00b6c3be2 100644
--- a/appendixa/kernel.xml
+++ b/appendixa/kernel.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch08-kernel"/>.</para>
 
 &aa-kernel-down;
-&aa-kernel-shortdesc;
-&aa-kernel-desc;
 &aa-kernel-dep;
 
 </sect1>
diff --git a/appendixa/less-shortdesc.xml b/appendixa/less-shortdesc.xml
index eab51f550..1df6ee2ea 100644
--- a/appendixa/less-shortdesc.xml
+++ b/appendixa/less-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Less</title>
+<sect2 id="contents-less"><title>Contents of Less</title>
 
 <!-- <para>(Last checked against version &less-contversion;.)</para> -->
 
diff --git a/appendixa/lfs-utils-shortdesc.xml b/appendixa/lfs-utils-shortdesc.xml
index 14cb50539..454a33a9a 100644
--- a/appendixa/lfs-utils-shortdesc.xml
+++ b/appendixa/lfs-utils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Lfs-Utils</title>
+<sect2 id="contents-lfs"><title>Contents of Lfs-Utils</title>
 
 <!-- <para>(Last checked against version &lfs-utils-contversion;.)</para> -->
 
diff --git a/appendixa/libtool-shortdesc.xml b/appendixa/libtool-shortdesc.xml
index a8feb6259..f73db53f8 100644
--- a/appendixa/libtool-shortdesc.xml
+++ b/appendixa/libtool-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Libtool</title>
+<sect2 id="contents-libtool"><title>Contents of Libtool</title>
 
 <!-- <para>(Last checked against version &libtool-contversion;.)</para> -->
 
diff --git a/appendixa/m4-shortdesc.xml b/appendixa/m4-shortdesc.xml
index 7cf572dda..64dcf30e9 100644
--- a/appendixa/m4-shortdesc.xml
+++ b/appendixa/m4-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of M4</title>
+<sect2 id="contents-m4"><title>Contents of M4</title>
 
 <!-- <para>(Last checked against version &m4-contversion;.)</para> -->
 
diff --git a/appendixa/make-shortdesc.xml b/appendixa/make-shortdesc.xml
index c30061dc2..c771b5e15 100644
--- a/appendixa/make-shortdesc.xml
+++ b/appendixa/make-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Make</title>
+<sect2 id="contents-make"><title>Contents of Make</title>
 
 <!-- <para>(Last checked against version &make-contversion;.)</para> -->
 
diff --git a/appendixa/makedev-shortdesc.xml b/appendixa/makedev-shortdesc.xml
index c77310bd3..31d8a453c 100644
--- a/appendixa/makedev-shortdesc.xml
+++ b/appendixa/makedev-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of MAKEDEV</title>
+<sect2 id="contents-makedev"><title>Contents of MAKEDEV</title>
 
 <!-- <para>(Last checked against version &makedev-contversion;.)</para> -->
 
diff --git a/appendixa/man-shortdesc.xml b/appendixa/man-shortdesc.xml
index bd631b85e..fcebbc3c2 100644
--- a/appendixa/man-shortdesc.xml
+++ b/appendixa/man-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Man</title>
+<sect2 id="contents-man"><title>Contents of Man</title>
 
 <!-- <para>(Last checked against version &man-contversion;.)</para> -->
 
diff --git a/appendixa/manpages-shortdesc.xml b/appendixa/manpages-shortdesc.xml
index bb8b0579e..e963d0146 100644
--- a/appendixa/manpages-shortdesc.xml
+++ b/appendixa/manpages-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Man-pages</title>
+<sect2 id="contents-manpages"><title>Contents of Man-pages</title>
 
 <!-- <para>(Last checked against version &man-pages-contversion;.)</para> -->
 
diff --git a/appendixa/modutils-shortdesc.xml b/appendixa/modutils-shortdesc.xml
index 6fd5849ae..43de4d2f4 100644
--- a/appendixa/modutils-shortdesc.xml
+++ b/appendixa/modutils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Modutils</title>
+<sect2 id="contents-modutils"><title>Contents of Modutils</title>
 
 <!-- <para>(Last checked against version &modutils-contversion;.)</para> -->
 
diff --git a/appendixa/ncurses-shortdesc.xml b/appendixa/ncurses-shortdesc.xml
index 217148d20..551c62607 100644
--- a/appendixa/ncurses-shortdesc.xml
+++ b/appendixa/ncurses-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Ncurses</title>
+<sect2 id="contents-ncurses"><title>Contents of Ncurses</title>
 
 <!-- <para>(Last checked against version &ncurses-contversion;.)</para> -->
 
diff --git a/appendixa/nettools-shortdesc.xml b/appendixa/nettools-shortdesc.xml
index c11e3e90e..8746b0ac9 100644
--- a/appendixa/nettools-shortdesc.xml
+++ b/appendixa/nettools-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Net-tools</title>
+<sect2 id="contents-net"><title>Contents of Net-tools</title>
 
 <!-- <para>(Last checked against version &net-tools-contversion;.)</para> -->
 
diff --git a/appendixa/patch-shortdesc.xml b/appendixa/patch-shortdesc.xml
index 7308fdeca..acc095910 100644
--- a/appendixa/patch-shortdesc.xml
+++ b/appendixa/patch-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Patch</title>
+<sect2 id="contents-patch"><title>Contents of Patch</title>
 
 <!-- <para>(Last checked against version &patch-contversion;.)</para> -->
 
diff --git a/appendixa/perl-shortdesc.xml b/appendixa/perl-shortdesc.xml
index a3bdd9bf7..bc215a020 100644
--- a/appendixa/perl-shortdesc.xml
+++ b/appendixa/perl-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Perl</title>
+<sect2 id="contents-perl"><title>Contents of Perl</title>
 
 <!-- <para>(Last checked against version &perl-contversion;.)</para> -->
 
diff --git a/appendixa/procinfo-shortdesc.xml b/appendixa/procinfo-shortdesc.xml
index 55d7c2e2b..8c13d0dc5 100644
--- a/appendixa/procinfo-shortdesc.xml
+++ b/appendixa/procinfo-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Procinfo</title>
+<sect2 id="contents-procinfo"><title>Contents of Procinfo</title>
 
 <!-- <para>(Last checked against version &procinfo-contversion;.)</para> -->
 
diff --git a/appendixa/procps-shortdesc.xml b/appendixa/procps-shortdesc.xml
index 33141ed50..5b443c55f 100644
--- a/appendixa/procps-shortdesc.xml
+++ b/appendixa/procps-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Procps</title>
+<sect2 id="contents-procps"><title>Contents of Procps</title>
 
 <!-- <para>(Last checked against version &procps-contversion;.)</para> -->
 
diff --git a/appendixa/psmisc-shortdesc.xml b/appendixa/psmisc-shortdesc.xml
index 3a9526cb7..c695d6ff5 100644
--- a/appendixa/psmisc-shortdesc.xml
+++ b/appendixa/psmisc-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Psmisc</title>
+<sect2 id="contents-psmisc"><title>Contents of Psmisc</title>
 
 <!-- <para>(Last checked against version &psmisc-contversion;.)</para> -->
 
diff --git a/appendixa/sed-shortdesc.xml b/appendixa/sed-shortdesc.xml
index f56546602..b291c660c 100644
--- a/appendixa/sed-shortdesc.xml
+++ b/appendixa/sed-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Sed</title>
+<sect2 id="contents-sed"><title>Contents of Sed</title>
 
 <!-- <para>(Last checked against version &sed-contversion;.)</para> -->
 
diff --git a/appendixa/shadowpwd-shortdesc.xml b/appendixa/shadowpwd-shortdesc.xml
index b44a5c9cd..fd6847106 100644
--- a/appendixa/shadowpwd-shortdesc.xml
+++ b/appendixa/shadowpwd-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Shadow</title>
+<sect2 id="contents-shadow"><title>Contents of Shadow</title>
 
 <!-- <para>(Last checked against version &shadow-contversion;.)</para> -->
 
diff --git a/appendixa/sysklogd-shortdesc.xml b/appendixa/sysklogd-shortdesc.xml
index 4e4f9cd44..f6c6304d2 100644
--- a/appendixa/sysklogd-shortdesc.xml
+++ b/appendixa/sysklogd-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Sysklogd</title>
+<sect2 id="contents-sysklogd"><title>Contents of Sysklogd</title>
 
 <!-- <para>(Last checked against version &sysklogd-contversion;.)</para> -->
 
diff --git a/appendixa/sysvinit-shortdesc.xml b/appendixa/sysvinit-shortdesc.xml
index 95464553b..dd5f4b3f3 100644
--- a/appendixa/sysvinit-shortdesc.xml
+++ b/appendixa/sysvinit-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Sysvinit</title>
+<sect2 id="contents-sysvinit"><title>Contents of Sysvinit</title>
 
 <!-- <para>(Last checked against version &sysvinit-contversion;.)</para> -->
 
diff --git a/appendixa/tar-shortdesc.xml b/appendixa/tar-shortdesc.xml
index ab20a0223..ce5e902e4 100644
--- a/appendixa/tar-shortdesc.xml
+++ b/appendixa/tar-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Tar</title>
+<sect2 id="contents-tar"><title>Contents of Tar</title>
 
 <!-- <para>(Last checked against version &tar-contversion;.)</para> -->
 
diff --git a/appendixa/tcl-shortdesc.xml b/appendixa/tcl-shortdesc.xml
index bfe6ed2bd..b969ee666 100644
--- a/appendixa/tcl-shortdesc.xml
+++ b/appendixa/tcl-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Tcl</title>
+<sect2 id="contents-tcl"><title>Contents of Tcl</title>
 
 <!-- <para>(Last checked against version &tcl-contversion;.)</para> -->
 
diff --git a/appendixa/tcl.xml b/appendixa/tcl.xml
index ca0445c09..77bf5df7c 100644
--- a/appendixa/tcl.xml
+++ b/appendixa/tcl.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch05-tcl"/>.</para>
 
 &aa-tcl-down;
-&aa-tcl-shortdesc;
-&aa-tcl-desc;
 &aa-tcl-dep;
 
 </sect1>
diff --git a/appendixa/texinfo-shortdesc.xml b/appendixa/texinfo-shortdesc.xml
index c8a7e98f7..7f36e41ca 100644
--- a/appendixa/texinfo-shortdesc.xml
+++ b/appendixa/texinfo-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Texinfo</title>
+<sect2 id="contents-texinfo"><title>Contents of Texinfo</title>
 
 <!-- <para>(Last checked against version &texinfo-contversion;.)</para> -->
 
diff --git a/appendixa/utillinux-shortdesc.xml b/appendixa/utillinux-shortdesc.xml
index 255742eb8..14f64f7b6 100644
--- a/appendixa/utillinux-shortdesc.xml
+++ b/appendixa/utillinux-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Util-linux</title>
+<sect2 id="contents-utillinux"><title>Contents of Util-linux</title>
 
 <!-- <para>(Last checked against version &util-linux-contversion;.)</para> -->
 
diff --git a/appendixa/vim-shortdesc.xml b/appendixa/vim-shortdesc.xml
index 5e00b9b44..13292d8ef 100644
--- a/appendixa/vim-shortdesc.xml
+++ b/appendixa/vim-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Vim</title>
+<sect2 id="contents-vim"><title>Contents of Vim</title>
 
 <!-- <para>(Last checked against version &vim-contversion;.)</para> -->
 
diff --git a/appendixa/zlib-shortdesc.xml b/appendixa/zlib-shortdesc.xml
index aeb804e8c..e76e10784 100644
--- a/appendixa/zlib-shortdesc.xml
+++ b/appendixa/zlib-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2><title>Contents of Zlib</title>
+<sect2 id="contents-zlib"><title>Contents of Zlib</title>
 
 <!-- <para>(Last checked against version &zlib-contversion;.)</para> -->
 
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 16824d4dd..a285c038c 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &bash-time-tools; 
 Estimated required disk space:  &bash-compsize-tools;</screen>
 
-&aa-bash-shortdesc;
-&aa-bash-dep;
+<para>For the package details see <xref linkend="contents-bash"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 2e2e46ba2..0ff391dca 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &binutils-time-tools-pass1;
 Estimated required disk space:  &binutils-compsize-tools-pass1;</screen>
 
-&aa-binutils-shortdesc;
-&aa-binutils-dep;
+<para>For the package details see <xref linkend="contents-binutils"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index be20eae98..c84ca8703 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &bzip2-time-tools;
 Estimated required disk space:  &bzip2-compsize-tools;</screen>
 
-&aa-bzip2-shortdesc;
-&aa-bzip2-dep;
+<para>For the package details see <xref linkend="contents-bzip2"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index f0a1eb7fb..72eb89a86 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &coreutils-time-tools;
 Estimated required disk space:  &coreutils-compsize-tools;</screen>
 
-&aa-coreutils-shortdesc;
-&aa-coreutils-dep;
+<para>For the package details see <xref linkend="contents-coreutils"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index dc37b94de..2e8a785c5 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &dejagnu-compsize-tools;</screen>
 
 &aa-dejagnu-shortdesc;
-&aa-dejagnu-dep;
+&aa-dejagnu-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 32ed45ce2..3d0aeeb88 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &diffutils-time-tools;
 Estimated required disk space:  &diffutils-compsize-tools;</screen>
 
-&aa-diffutils-shortdesc;
-&aa-diffutils-dep;
+<para>For the package details see <xref linkend="contents-diffutils"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index f2505d1ae..56a3c8a85 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &expect-compsize-tools;</screen>
 
 &aa-expect-shortdesc;
-&aa-expect-dep;
+&aa-expect-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 19cf03288..0b6d3547c 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &findutils-time-tools;
 Estimated required disk space:  &findutils-compsize-tools;</screen>
 
-&aa-findutils-shortdesc;
-&aa-findutils-dep;
+<para>For the package details see <xref linkend="contents-findutils"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 48c9cb61f..dea6ee46b 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &gawk-time-tools;
 Estimated required disk space:  &gawk-compsize-tools;</screen>
 
-&aa-gawk-shortdesc;
-&aa-gawk-dep;
+<para>For the package details see <xref linkend="contents-gawk"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 226b67333..4ca3a47da 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &gcc-time-tools-pass1;
 Estimated required disk space:  &gcc-compsize-tools-pass1;</screen>
 
-&aa-gcc-shortdesc;
-&aa-gcc-dep;
+<para>For the package details see <xref linkend="contents-gcc"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 18a3d57c8..146c55000 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &gettext-time-tools;
 Estimated required disk space:  &gettext-compsize-tools;</screen>
 
-&aa-gettext-shortdesc;
-&aa-gettext-dep;
+<para>For the package details see <xref linkend="contents-gettext"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index aa333a2bd..22c10df0d 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &glibc-time-tools;
 Estimated required disk space:  &glibc-compsize-tools;</screen>
 
-&aa-glibc-shortdesc;
-&aa-glibc-dep;
+<para>For the package details see <xref linkend="contents-glibc"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index f5e06b0df..5e293fac6 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &grep-time-tools;
 Estimated required disk space:  &grep-compsize-tools;</screen>
 
-&aa-grep-shortdesc;
-&aa-grep-dep;
+<para>For the package details see <xref linkend="contents-grep"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 149208f6d..2f27a0379 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &gzip-time-tools;
 Estimated required disk space:  &gzip-compsize-tools;</screen>
 
-&aa-gzip-shortdesc;
-&aa-gzip-dep;
+<para>For the package details see <xref linkend="contents-gzip"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/kernelheaders.xml b/chapter05/kernelheaders.xml
index a5f3e3a0b..8d4d2b40e 100644
--- a/chapter05/kernelheaders.xml
+++ b/chapter05/kernelheaders.xml
@@ -5,9 +5,6 @@
 <screen>Estimated build time:           &kernel-time-headers;
 Estimated required disk space:  &kernel-compsize-headers;</screen>
 
-&aa-kernel-shortdesc;
-&aa-kernel-dep;
-
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 6307edb8f..395a5d23e 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &make-time-tools;
 Estimated required disk space:  &make-compsize-tools;</screen>
 
-&aa-make-shortdesc;
-&aa-make-dep;
+<para>For the package details see <xref linkend="contents-make"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 045bd3412..25ebb14fc 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &ncurses-time-tools;
 Estimated required disk space:  &ncurses-compsize-tools;</screen>
 
-&aa-ncurses-shortdesc;
-&aa-ncurses-dep;
+<para>For the package details see <xref linkend="contents-ncurses"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index fc4e874bf..e0aef0faf 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &patch-time-tools;
 Estimated required disk space:  &patch-compsize-tools;</screen>
 
-&aa-patch-shortdesc;
-&aa-patch-dep;
+<para>For the package details see <xref linkend="contents-patch"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index be1597e30..2a332ca5e 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &perl-time-tools;
 Estimated required disk space:  &perl-compsize-tools;</screen>
 
-&aa-perl-shortdesc;
-&aa-perl-dep;
+<para>For the package details see <xref linkend="contents-perl"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 0e202650f..6c9a30d77 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &sed-time-tools;
 Estimated required disk space:  &sed-compsize-tools;</screen>
 
-&aa-sed-shortdesc;
-&aa-sed-dep;
+<para>For the package details see <xref linkend="contents-sed"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 50bdd5aba..b3b926078 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &tar-time-tools;
 Estimated required disk space:  &tar-compsize-tools;</screen>
 
-&aa-tar-shortdesc;
-&aa-tar-dep;
+<para>For the package details see <xref linkend="contents-tar"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 364be9ce9..62f165c50 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &tcl-compsize-tools;</screen>
 
 &aa-tcl-shortdesc;
-&aa-tcl-dep;
+&aa-tcl-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index eb9fa9ab4..d8f25a5bf 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &texinfo-time-tools;
 Estimated required disk space:  &texinfo-compsize-tools;</screen>
 
-&aa-texinfo-shortdesc;
-&aa-texinfo-dep;
+<para>For the package details see <xref linkend="contents-texinfo"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 33c79ff99..06f9d6a81 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -5,8 +5,7 @@
 <screen>Estimated build time:           &util-linux-time-tools;
 Estimated required disk space:  &util-linux-compsize-tools;</screen>
 
-&aa-utillinux-shortdesc;
-&aa-utillinux-dep;
+<para>For the package details see <xref linkend="contents-utillinux"/>.</para>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index 8950a9159..e3df3b1eb 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -5,9 +5,6 @@
 <screen>Estimated build time:           &kernel-time-headers;
 Estimated required disk space:  &kernel-compsize-headers;</screen>
 
-&aa-kernel-shortdesc;
-&aa-kernel-desc;
-
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index f9587ac72..df5565f65 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &kernel-compsize;</screen>
 
 &aa-kernel-shortdesc;
-&aa-kernel-dep;
+&aa-kernel-desc;
 &c8-kernel-inst;
 
 </sect1>