Index: materials/alpha/packages.xml
===================================================================
--- materials/alpha/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/alpha/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry>
-      <term>Aboot (&aboot-version;) - &aboot-size;:</term>
+      <term>Aboot (&aboot-version;) - <token>&aboot-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&aboot-home;"/></para>
@@ -24,5 +24,7 @@
   </variablelist>
 
-  <para>Total size of these packages: about 2,6 MB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>
Index: materials/alpha/patches.xml
===================================================================
--- materials/alpha/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/alpha/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry>
-      <term>Aboot Patch - &aboot-alpha-patch-size;:</term>
+      <term>Aboot Patch - <token>&aboot-alpha-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -28,3 +28,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/common/packages.xml
===================================================================
--- materials/common/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/common/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -16,5 +16,5 @@
 
     <varlistentry>
-      <term>Autoconf (&autoconf-version;) - &autoconf-size;:</term>
+      <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&autoconf-home;"/></para>
@@ -25,5 +25,5 @@
 
     <varlistentry>
-      <term>Automake (&automake-version;) - &automake-size;:</term>
+      <term>Automake (&automake-version;) - <token>&automake-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&automake-home;"/></para>
@@ -34,5 +34,5 @@
 
     <varlistentry>
-      <term>Bash (&bash-version;) - &bash-size;:</term>
+      <term>Bash (&bash-version;) - <token>&bash-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bash-home;"/></para>
@@ -43,5 +43,5 @@
 
     <varlistentry>
-      <term>Bash Documentation (&bash-doc-version;) - &bash-doc-size;:</term>
+      <term>Bash Documentation (&bash-doc-version;) - <token>&bash-doc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bash-doc-home;"/></para>
@@ -52,5 +52,5 @@
 
     <varlistentry>
-      <term>Binutils (&binutils-version;) - &binutils-size;:</term>
+      <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&binutils-home;"/></para>
@@ -61,5 +61,5 @@
 
     <varlistentry>
-      <term>Bison (&bison-version;) - &bison-size;:</term>
+      <term>Bison (&bison-version;) - <token>&bison-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bison-home;"/></para>
@@ -70,5 +70,5 @@
 
     <varlistentry>
-      <term>Bzip2 (&bzip2-version;) - &bzip2-size;:</term>
+      <term>Bzip2 (&bzip2-version;) - <token>&bzip2-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bzip2-home;"/></para>
@@ -79,5 +79,5 @@
 
     <varlistentry>
-      <term>CLFS-Bootscripts (&clfs-bootscripts-version;) - &clfs-bootscripts-size;:</term>
+      <term>CLFS-Bootscripts (&clfs-bootscripts-version;) - <token>&clfs-bootscripts-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&clfs-bootscripts-home;"/></para>
@@ -88,5 +88,5 @@
 
     <varlistentry>
-      <term>Coreutils (&coreutils-version;) - &coreutils-size;:</term>
+      <term>Coreutils (&coreutils-version;) - <token>&coreutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&coreutils-home;"/></para>
@@ -97,5 +97,5 @@
 
     <varlistentry>
-      <term>DejaGNU (&dejagnu-version;) - &dejagnu-size;:</term>
+      <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&dejagnu-home;"/></para>
@@ -106,5 +106,5 @@
 
     <varlistentry>
-      <term>Diffutils (&diffutils-version;) - &diffutils-size;:</term>
+      <term>Diffutils (&diffutils-version;) - <token>&diffutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&diffutils-home;"/></para>
@@ -115,5 +115,5 @@
 
     <varlistentry>
-      <term>E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;:</term>
+      <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&e2fsprogs-home;"/></para>
@@ -124,5 +124,5 @@
 
     <varlistentry>
-      <term>Expect (&expect-version;) - &expect-size;:</term>
+      <term>Expect (&expect-version;) - <token>&expect-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&expect-home;"/></para>
@@ -133,5 +133,5 @@
 
     <varlistentry>
-      <term>File (&file-version;) - &file-size;:</term>
+      <term>File (&file-version;) - <token>&file-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&file-home;"/></para>
@@ -151,5 +151,5 @@
 
     <varlistentry>
-      <term>Findutils (&findutils-version;) - &findutils-size;:</term>
+      <term>Findutils (&findutils-version;) - <token>&findutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&findutils-home;"/></para>
@@ -160,5 +160,5 @@
 
     <varlistentry>
-      <term>Flex (&flex-version;) - &flex-size;:</term>
+      <term>Flex (&flex-version;) - <token>&flex-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&flex-home;"/></para>
@@ -169,5 +169,5 @@
 
     <varlistentry>
-      <term>Gawk (&gawk-version;) - &gawk-size;:</term>
+      <term>Gawk (&gawk-version;) - <token>&gawk-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gawk-home;"/></para>
@@ -178,5 +178,5 @@
 
     <varlistentry>
-      <term>GCC (&gcc-version;) - &gcc-size;:</term>
+      <term>GCC (&gcc-version;) - <token>&gcc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gcc-home;"/></para>
@@ -187,5 +187,5 @@
 
     <varlistentry>
-      <term>Gettext (&gettext-version;) - &gettext-size;:</term>
+      <term>Gettext (&gettext-version;) - <token>&gettext-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gettext-home;"/></para>
@@ -196,5 +196,5 @@
 
     <varlistentry>
-      <term>Glibc (&glibc-version;) - &glibc-size;:</term>
+      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&glibc-home;"/></para>
@@ -205,5 +205,5 @@
 
     <varlistentry>
-      <term>Grep (&grep-version;) - &grep-size;:</term>
+      <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&grep-home;"/></para>
@@ -214,5 +214,5 @@
 
     <varlistentry>
-      <term>Groff (&groff-version;) - &groff-size;:</term>
+      <term>Groff (&groff-version;) - <token>&groff-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&groff-home;"/></para>
@@ -223,5 +223,5 @@
 
     <varlistentry>
-      <term>Gzip (&gzip-version;) - &gzip-size;:</term>
+      <term>Gzip (&gzip-version;) - <token>&gzip-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&gzip-home;"/></para>
@@ -232,5 +232,5 @@
 
     <varlistentry>
-      <term>Iana-Etc (&iana-etc-version;) - &iana-etc-size;:</term>
+      <term>Iana-Etc (&iana-etc-version;) - <token>&iana-etc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&iana-etc-home;"/></para>
@@ -241,5 +241,5 @@
 
     <varlistentry>
-      <term>Inetutils (&inetutils-version;) - &inetutils-size;:</term>
+      <term>Inetutils (&inetutils-version;) - <token>&inetutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&inetutils-home;"/></para>
@@ -250,5 +250,5 @@
 
     <varlistentry>
-      <term>IPRoute2 (&iproute2-version;) - &iproute2-size;:</term>
+      <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&iproute2-home;"/></para>
@@ -259,5 +259,5 @@
 
     <varlistentry>
-      <term>Kbd (&kbd-version;) - &kbd-size;:</term>
+      <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&kbd-home;"/></para>
@@ -268,5 +268,5 @@
 
     <varlistentry>
-      <term>Less (&less-version;) - &less-size;:</term>
+      <term>Less (&less-version;) - <token>&less-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&less-home;"/></para>
@@ -277,5 +277,5 @@
 
     <varlistentry>
-      <term>Libtool (&libtool-version;) - &libtool-size;:</term>
+      <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&libtool-home;"/></para>
@@ -286,5 +286,5 @@
 
     <varlistentry>
-      <term>Linux (&linux-version;) - &linux-size;:</term>
+      <term>Linux (&linux-version;) - <token>&linux-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&linux-home;"/></para>
@@ -295,5 +295,5 @@
 
     <varlistentry>
-      <term>Linux-Headers (&linux-headers-version;) - &linux-headers-size;:</term>
+      <term>Linux-Headers (&linux-headers-version;) - <token>&linux-headers-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&linux-headers-home;"/></para>
@@ -304,5 +304,5 @@
 
     <varlistentry>
-      <term>M4 (&m4-version;) - &m4-size;:</term>
+      <term>M4 (&m4-version;) - <token>&m4-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&m4-home;"/></para>
@@ -313,5 +313,5 @@
 
     <varlistentry>
-      <term>Make (&make-version;) - &make-size;:</term>
+      <term>Make (&make-version;) - <token>&make-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&make-home;"/></para>
@@ -322,5 +322,5 @@
 
     <varlistentry>
-      <term>Man (&man-version;) - &man-size;:</term>
+      <term>Man (&man-version;) - <token>&man-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&man-home;"/></para>
@@ -331,5 +331,5 @@
 
     <varlistentry>
-      <term>Man-pages (&man-pages-version;) - &man-pages-size;:</term>
+      <term>Man-pages (&man-pages-version;) - <token>&man-pages-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&man-pages-home;"/></para>
@@ -340,5 +340,5 @@
 
     <varlistentry>
-      <term>Mktemp (&mktemp-version;) - &mktemp-size;:</term>
+      <term>Mktemp (&mktemp-version;) - <token>&mktemp-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&mktemp-home;"/></para>
@@ -349,5 +349,5 @@
 
     <varlistentry>
-      <term>Module-Init-Tools (&module-init-tools-version;) - &module-init-tools-size;:</term>
+      <term>Module-Init-Tools (&module-init-tools-version;) - <token>&module-init-tools-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&module-init-tools-home;"/></para>
@@ -358,5 +358,5 @@
 
     <varlistentry>
-      <term>Ncurses (&ncurses-version;) - &ncurses-size;:</term>
+      <term>Ncurses (&ncurses-version;) - <token>&ncurses-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&ncurses-home;"/></para>
@@ -367,5 +367,5 @@
 
     <varlistentry>
-      <term>Patch (&patch-version;) - &patch-size;:</term>
+      <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&patch-home;"/></para>
@@ -376,5 +376,5 @@
 
     <varlistentry>
-      <term>Perl (&perl-version;) - &perl-size;:</term>
+      <term>Perl (&perl-version;) - <token>&perl-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&perl-home;"/></para>
@@ -385,5 +385,5 @@
 
     <varlistentry>
-      <term>Procps (&procps-version;) - &procps-size;:</term>
+      <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&procps-home;"/></para>
@@ -394,5 +394,5 @@
 
     <varlistentry>
-      <term>Psmisc (&psmisc-version;) - &psmisc-size;:</term>
+      <term>Psmisc (&psmisc-version;) - <token>&psmisc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&psmisc-home;"/></para>
@@ -403,5 +403,5 @@
 
     <varlistentry>
-      <term>Readline (&readline-version;) - &readline-size;:</term>
+      <term>Readline (&readline-version;) - <token>&readline-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&readline-home;"/></para>
@@ -412,5 +412,5 @@
 
     <varlistentry>
-      <term>Sed (&sed-version;) - &sed-size;:</term>
+      <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sed-home;"/></para>
@@ -421,5 +421,5 @@
 
     <varlistentry>
-      <term>Shadow (&shadow-version;) - &shadow-size;:</term>
+      <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&shadow-home;"/></para>
@@ -439,5 +439,5 @@
 
     <varlistentry>
-      <term>Sysklogd (&sysklogd-version;) - &sysklogd-size;:</term>
+      <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sysklogd-home;"/></para>
@@ -448,5 +448,5 @@
 
     <varlistentry>
-      <term>Sysvinit (&sysvinit-version;) - &sysvinit-size;:</term>
+      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&sysvinit-home;"/></para>
@@ -457,5 +457,5 @@
 
     <varlistentry>
-      <term>Tar (&tar-version;) - &tar-size;:</term>
+      <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&tar-home;"/></para>
@@ -466,5 +466,5 @@
 
     <varlistentry>
-      <term>Tcl (&tcl-version;) - &tcl-size;:</term>
+      <term>Tcl (&tcl-version;) - <token>&tcl-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&tcl-home;"/></para>
@@ -475,5 +475,5 @@
 
     <varlistentry>
-      <term>Texinfo (&texinfo-version;) - &texinfo-size;:</term>
+      <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&texinfo-home;"/></para>
@@ -484,5 +484,5 @@
 
     <varlistentry>
-      <term>Tree (&tree-version;) - &tree-size;:</term>
+      <term>Tree (&tree-version;) - <token>&tree-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&tree-home;"/></para>
@@ -493,5 +493,5 @@
 
     <varlistentry>
-      <term>Udev (&udev-version;) - &udev-size;:</term>
+      <term>Udev (&udev-version;) - <token>&udev-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&udev-home;"/></para>
@@ -502,5 +502,5 @@
 
     <varlistentry>
-      <term>Udev Cross-LFS Rules (&udev-cross-lfs-version;) - &udev-cross-lfs-size;:</term>
+      <term>Udev Cross-LFS Rules (&udev-cross-lfs-version;) - <token>&udev-cross-lfs-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&udev-cross-lfs-home;"/></para>
@@ -511,5 +511,5 @@
 
     <varlistentry>
-      <term>Util-linux (&util-linux-version;) - &util-linux-size;:</term>
+      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&util-linux-home;"/></para>
@@ -520,5 +520,5 @@
 
     <varlistentry>
-      <term>Vim (&vim-version;) - &vim-size;:</term>
+      <term>Vim (&vim-version;) - <token>&vim-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&vim-home;"/></para>
@@ -529,5 +529,5 @@
 
     <varlistentry>
-      <term>Vim (&vim-version;) language files (optional) - &vim-language-size;:</term>
+      <term>Vim (&vim-version;) language files (optional) - <token>&vim-language-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&vim-language-home;"/></para>
@@ -538,5 +538,5 @@
 
     <varlistentry>
-      <term>Zlib (&zlib-version;) - &zlib-size;:</term>
+      <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&zlib-home;"/></para>
@@ -548,5 +548,5 @@
   </variablelist>
 
-  <para>Total size of these packages: about 154 MB</para>
+  <para os="a">Total size of these packages: about <returnvalue/></para>
 
 </sect1>
Index: materials/common/patches.xml
===================================================================
--- materials/common/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/common/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -11,5 +11,5 @@
   <title>Needed Patches</title>
 
-  <para os="a">In addition to the packages, several patches are also required.
+  <para>In addition to the packages, several patches are also required.
   These patches correct any mistakes in the packages that should be
   fixed by the maintainer. The patches also make small modifications to
@@ -20,5 +20,5 @@
 
     <varlistentry>
-      <term>Bash Fixes Patch - &bash-fixes-patch-size;:</term>
+      <term>Bash Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -29,5 +29,5 @@
 
     <varlistentry>
-      <term>Binutils Posix Patch - &binutils-posix-patch-size;:</term>
+      <term>Binutils Posix Patch - <token>&binutils-posix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -38,5 +38,5 @@
 
     <varlistentry>
-      <term>Bzip2 Documentation Patch - &bzip2-docs-patch-size;:</term>
+      <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -47,5 +47,5 @@
 
     <varlistentry>
-      <term>Bzip2 Bzdiff Remove Tempfile - &bzip2-remove_tempfile-patch-size;:</term>
+      <term>Bzip2 Bzdiff Remove Tempfile - <token>&bzip2-remove_tempfile-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -56,5 +56,5 @@
 
     <varlistentry>
-      <term>Bzip2 Bzgrep Security Fixes Patch - &bzip2-bzgrep-patch-size;:</term>
+      <term>Bzip2 Bzgrep Security Fixes Patch - <token>&bzip2-bzgrep-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -65,5 +65,5 @@
 
     <varlistentry>
-      <term>Coreutils Suppress Uptime, Kill, Su Patch - &coreutils-suppress-patch-size;:</term>
+      <term>Coreutils Suppress Uptime, Kill, Su Patch - <token>&coreutils-suppress-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -74,5 +74,5 @@
 
     <varlistentry>
-      <term>Expect Spawn Patch - &expect-spawn-patch-size;:</term>
+      <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -83,5 +83,5 @@
 
     <varlistentry>
-      <term>Gawk Segfault Patch - &gawk-segfault-patch-size;B:</term>
+      <term>Gawk Segfault Patch - <token>&gawk-segfault-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -92,5 +92,5 @@
 
     <varlistentry>
-      <term>GCC Cross Search Paths Patch - &gcc-cross_search-patch-size;:</term>
+      <term>GCC Cross Search Paths Patch - <token>&gcc-cross_search-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -101,5 +101,5 @@
 
     <varlistentry>
-      <term>GCC PR20425 Patch - &gcc-PR20425-patch-size;:</term>
+      <term>GCC PR20425 Patch - <token>&gcc-PR20425-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -110,5 +110,5 @@
 
     <varlistentry>
-      <term>GCC PR26763 Patch - &gcc-PR26763-patch-size;:</term>
+      <term>GCC PR26763 Patch - <token>&gcc-PR26763-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -119,5 +119,5 @@
 
     <varlistentry>
-      <term>GCC Posix Patch - &gcc-posix-patch-size;:</term>
+      <term>GCC Posix Patch - <token>&gcc-posix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -128,5 +128,5 @@
 
     <varlistentry>
-      <term>Glibc Disable linking with libgcc_eh.a - &glibc-libgcc_eh-patch-size;:</term>
+      <term>Glibc Disable linking with libgcc_eh.a - <token>&glibc-libgcc_eh-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -137,5 +137,5 @@
 
     <varlistentry>
-      <term>Glibc Localedef Segfault - &glibc-localedef_segfault-patch-size;:</term>
+      <term>Glibc Localedef Segfault - <token>&glibc-localedef_segfault-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -146,5 +146,5 @@
 
     <varlistentry>
-      <term>Gzip Security Fix Patch - &gzip-security_fix-patch-size;:</term>
+      <term>Gzip Security Fix Patch - <token>&gzip-security_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -155,5 +155,5 @@
 
     <varlistentry>
-      <term>Inetutils GCC 4.x Fixes Patch - &inetutils-gcc4_fixes-patch-size;:</term>
+      <term>Inetutils GCC 4.x Fixes Patch - <token>&inetutils-gcc4_fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -164,5 +164,5 @@
 
     <varlistentry>
-      <term>Inetutils No-Server-Man-Pages Patch - &inetutils-man_pages-patch-size;:</term>
+      <term>Inetutils No-Server-Man-Pages Patch - <token>&inetutils-man_pages-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -173,5 +173,5 @@
 
     <varlistentry>
-      <term>KBD GCC 4.x Fixes Patch - &kbd-gcc4_fixes-patch-size;:</term>
+      <term>KBD GCC 4.x Fixes Patch - <token>&kbd-gcc4_fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -182,5 +182,5 @@
 
     <varlistentry>
-      <term>Mktemp Tempfile Patch - &mktemp-tempfile-patch-size;:</term>
+      <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -191,5 +191,5 @@
 
     <varlistentry>
-      <term>Perl Libc Patch - &perl-libc-patch-size;:</term>
+      <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -200,5 +200,5 @@
 
     <varlistentry>
-      <term>Readline Fixes Patch - &readline-fixes-patch-size;:</term>
+      <term>Readline Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -209,5 +209,5 @@
 
     <varlistentry>
-      <term>Sysklogd Fixes Patch - &sysklogd-fixes-patch-size;:</term>
+      <term>Sysklogd Fixes Patch - <token>&sysklogd-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -218,5 +218,5 @@
 
     <varlistentry>
-      <term>Tar GCC-4.x Fix Patch - &tar-gcc4_fix-patch-size;:</term>
+      <term>Tar GCC-4.x Fix Patch - <token>&tar-gcc4_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -227,5 +227,5 @@
 
     <varlistentry>
-      <term>Tar Security Fix Patch - &tar-security_fixes-patch-size;:</term>
+      <term>Tar Security Fix Patch - <token>&tar-security_fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -236,5 +236,5 @@
 
     <varlistentry>
-      <term>Tar Sparse Fix Patch - &tar-sparse_fix-patch-size;:</term>
+      <term>Tar Sparse Fix Patch - <token>&tar-sparse_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -245,5 +245,5 @@
 
     <varlistentry>
-       <term>Texinfo Tempfile Fix Patch - &texinfo-tempfile_fix-patch-size;:</term>
+       <term>Texinfo Tempfile Fix Patch - <token>&texinfo-tempfile_fix-patch-size;</token>:</term>
        <listitem>
         <para>Download: <ulink
@@ -254,5 +254,5 @@
 
     <varlistentry>
-      <term>Util-linux Cramfs Patch - &util-linux-cramfs-patch-size;:</term> <listitem>
+      <term>Util-linux Cramfs Patch - <token>&util-linux-cramfs-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;util-linux/&util-linux-cramfs-patch;"/></para>
@@ -262,5 +262,5 @@
 
     <varlistentry>
-      <term>Util-linux GCC 4.x Patch - &util-linux-gcc4_fixes-patch-size;:</term> <listitem>
+      <term>Util-linux GCC 4.x Patch - <token>&util-linux-gcc4_fixes-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;util-linux/&util-linux-gcc4_fixes-patch;"/></para>
@@ -270,5 +270,5 @@
 
     <varlistentry>
-      <term>Vim Fixes Patch - &vim-fixes-patch-size;:</term>
+      <term>Vim Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -279,5 +279,5 @@
 
     <varlistentry>
-      <term>Zlib fPIC Patch - &zlib-fpic-patch-size;:</term> <listitem>
+      <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;zlib/&zlib-fpic-patch;"/></para>
@@ -288,5 +288,7 @@
   </variablelist>
 
-  <para os="b">In addition to the above required patches, there exist a number of
+  <para os="a">Total size of these patches: about <returnvalue/></para>
+
+  <para>In addition to the above required patches, there exist a number of
   optional patches created by the LFS community. These optional patches
   solve minor problems or enable functionality that is not enabled by
Index: materials/mips/packages.xml
===================================================================
--- materials/mips/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/mips/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="arcload">
-      <term>ARCLoad (&arcload-version;) - &arcload-size;:</term>
+      <term>ARCLoad (&arcload-version;) - <token>&arcload-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&arcload-home;"/></para>
@@ -23,5 +23,5 @@
 
     <varlistentry os="colo">
-      <term>Colo (&colo-version;) - &colo-size;:</term>
+      <term>Colo (&colo-version;) - <token>&colo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&colo-home;"/></para>
@@ -32,5 +32,5 @@
 
     <varlistentry os="dvhtool">
-      <term>DVHtool (&dvhtool-version;) - &dvhtool-size;:</term>
+      <term>DVHtool (&dvhtool-version;) - <token>&dvhtool-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&dvhtool-home;"/></para>
@@ -41,5 +41,5 @@
 
     <varlistentry os="glibcports">
-      <term>Glibc Ports (&glibc-ports-version;) - &glibc-ports-size;:</term>
+      <term>Glibc Ports (&glibc-ports-version;) - <token>&glibc-ports-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&glibc-ports-home;"/></para>
@@ -51,5 +51,7 @@
   </variablelist>
 
-  <para os="a">Total size of these packages: about 349 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>
Index: materials/mips/patches.xml
===================================================================
--- materials/mips/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/mips/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="dvhtool-fixes-patch">
-      <term>Dvhtool Fixes - &dvhtool-fixes-patch-size;:</term>
+      <term>Dvhtool Fixes - <token>&dvhtool-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -23,5 +23,5 @@
 
     <varlistentry os="expect-mips_update-patch">
-      <term>Expect Config Update Patch - &expect-mips_update-patch-size;:</term>
+      <term>Expect Config Update Patch - <token>&expect-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -32,5 +32,5 @@
 
     <varlistentry os="file-mips_update-patch">
-      <term>File Config Update Patch -  file-mips_update-patch-size;:</term>
+      <term>File Config Update Patch -  <token>&file-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -45,5 +45,5 @@
 
     <varlistentry os="glibc-mips_fix-patch">
-      <term>GLIBC MIPS  Patch - &glibc-mips-patch-size;:</term>
+      <term>GLIBC MIPS  Patch - <token>&glibc-mips-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -54,5 +54,5 @@
 
     <varlistentry os="grep-mips_update-patch">
-      <term>Grep Config Update Patch - &grep-mips_update-patch-size;:</term>
+      <term>Grep Config Update Patch - <token>&grep-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -63,5 +63,5 @@
 
     <varlistentry os="linux-mips-patch">
-      <term>Linux-MIPS Merge Patch - &linux-mips-patch-size;:</term>
+      <term>Linux-MIPS Merge Patch - <token>&linux-mips-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -72,5 +72,5 @@
 
     <varlistentry os="mktemp-mips_update-patch">
-      <term>Mktemp Config Update Patch - &mktemp-mips_update-patch-size;:</term>
+      <term>Mktemp Config Update Patch - <token>&mktemp-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -81,5 +81,5 @@
 
     <varlistentry os="module-init-tools-mips_update-patch">
-      <term>Module-init-tools Config Update Patch - &module-init-tools-mips_update-patch-size;:</term>
+      <term>Module-init-tools Config Update Patch - <token>&module-init-tools-mips_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -91,3 +91,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/mips64-64/packages.xml
===================================================================
--- materials/mips64-64/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/mips64-64/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -16,5 +16,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
Index: materials/mips64-64/patches.xml
===================================================================
--- materials/mips64-64/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/mips64-64/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -63,3 +63,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/mips64/packages.xml
===================================================================
--- materials/mips64/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/mips64/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -16,5 +16,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
Index: materials/mips64/patches.xml
===================================================================
--- materials/mips64/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/mips64/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -18,5 +18,5 @@
 
     <varlistentry os="colo-mips-patch">
-      <term>Colo Make Patch - &colo-make-patch-size;:</term> <listitem>
+      <term>Colo Make Patch - <token>&colo-make-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
         url="&patches-root;colo/&colo-make-patch;"/></para>
@@ -70,5 +70,5 @@
 
     <varlistentry os="util-linux-mips64-patch">
-      <term>Util-linux MIPS64 Patch - &util-linux-mips64-patch-size;:</term>
+      <term>Util-linux MIPS64 Patch - <token>&util-linux-mips64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -80,3 +80,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/ppc/packages.xml
===================================================================
--- materials/ppc/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/ppc/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry>
-      <term>Hfsutils (&hfsutils-version;) - &hfsutils-size;:</term>
+      <term>Hfsutils (&hfsutils-version;) - <token>&hfsutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&hfsutils-home;"/></para>
@@ -23,5 +23,5 @@
 
     <varlistentry>
-      <term>Parted (&parted-version;) - &parted-size;:</term>
+      <term>Parted (&parted-version;) - <token>&parted-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&parted-home;"/></para>
@@ -32,5 +32,5 @@
 
     <varlistentry>
-      <term>Powerpc-utils (&powerpcutils-version;) - &powerpcutils-size;:</term>
+      <term>Powerpc-utils (&powerpcutils-version;) - <token>&powerpcutils-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&powerpcutils-home;"/></para>
@@ -41,5 +41,5 @@
 
     <varlistentry>
-      <term>Yaboot (&yaboot-version;) - &yaboot-size;:</term>
+      <term>Yaboot (&yaboot-version;) - <token>&yaboot-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&yaboot-home;"/></para>
@@ -51,5 +51,7 @@
   </variablelist>
 
-  <para os="a">Total size of these packages: about 2.1 MB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>
Index: materials/ppc/patches.xml
===================================================================
--- materials/ppc/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/ppc/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -18,5 +18,5 @@
 
     <varlistentry>
-      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - &powerpcutils-patch-size;:</term>
+      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - <token>&powerpcutils-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -27,5 +27,5 @@
 
     <varlistentry os="yaboot-fix-patch">
-      <term>Yaboot (&yaboot-version;) Fixes Patch - &yaboot-fix-patch-size;:</term>
+      <term>Yaboot (&yaboot-version;) Fixes Patch - <token>&yaboot-fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -36,5 +36,5 @@
 
     <varlistentry os="yaboot-sata-patch">
-      <term>Yaboot (&yaboot-version;) SATA Patch - &yaboot-sata-patch-size;:</term>
+      <term>Yaboot (&yaboot-version;) SATA Patch - <token>&yaboot-sata-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -46,3 +46,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/ppc64/packages.xml
===================================================================
--- materials/ppc64/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/ppc64/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -16,5 +16,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
Index: materials/ppc64/patches.xml
===================================================================
--- materials/ppc64/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/ppc64/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -22,5 +22,5 @@
 
     <varlistentry>
-      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - &powerpcutils64-patch-size;:</term>
+      <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - <token>&powerpcutils64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -40,3 +40,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/sparc/packages.xml
===================================================================
--- materials/sparc/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/sparc/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="elftoaout">
-      <term>ELFtoaout (&elftoaout-version;) - &elftoaout-size;:</term>
+      <term>ELFtoaout (&elftoaout-version;) - <token>&elftoaout-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&elftoaout-home;"/></para>
@@ -23,5 +23,5 @@
 
     <varlistentry os="silo">
-      <term>Silo (&silo-version;) - &silo-size;:</term>
+      <term>Silo (&silo-version;) - <token>&silo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&silo-home;"/></para>
@@ -33,5 +33,7 @@
   </variablelist>
 
-  <para os="a">Total size of these packages: about 265 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>
Index: materials/sparc/patches.xml
===================================================================
--- materials/sparc/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/sparc/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="elftoaout-fixes-patch">
-      <term>Elftoaout Fixes Patch - &elftoaout-fixes-patch-size;:</term>
+      <term>Elftoaout Fixes Patch - <token>&elftoaout-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -23,5 +23,5 @@
 
     <varlistentry os="gcc-sparc_tls-patch">
-      <term>GCC Sparc TLS Fix - &gcc-sparc_tls-patch-size;:</term>
+      <term>GCC Sparc TLS Fix - <token>&gcc-sparc_tls-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -36,5 +36,5 @@
 
    <varlistentry os="kbd-sparc_kbdrate-patch">
-      <term>KBD kbdrate Patch - &kbd-sparc_kbdrate-patch-size;:</term>
+      <term>KBD kbdrate Patch - <token>&kbd-sparc_kbdrate-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -45,5 +45,5 @@
 
     <varlistentry os="silo-fixes-patch">
-      <term>Silo Fixes Patch - &silo-fixes-patch-size;:</term>
+      <term>Silo Fixes Patch - <token>&silo-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -55,3 +55,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/sparc64-64/packages.xml
===================================================================
--- materials/sparc64-64/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/sparc64-64/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -16,5 +16,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
Index: materials/sparc64-64/patches.xml
===================================================================
--- materials/sparc64-64/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/sparc64-64/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -39,3 +39,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/sparc64/packages.xml
===================================================================
--- materials/sparc64/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/sparc64/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -16,5 +16,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
Index: materials/sparc64/patches.xml
===================================================================
--- materials/sparc64/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/sparc64/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -47,3 +47,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/x86/packages.xml
===================================================================
--- materials/x86/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/x86/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="grub">
-      <term>GRUB (&grub-version;) - &grub-size;:</term>
+      <term>GRUB (&grub-version;) - <token>&grub-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&grub-home;"/></para>
@@ -24,5 +24,7 @@
   </variablelist>
 
-  <para os="a">Total size of these packages: about 950 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>
Index: materials/x86/patches.xml
===================================================================
--- materials/x86/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/x86/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="coreutils-x86_uname-patch">
-      <term>Coreutils Uname Patch - &coreutils-x86_uname-patch-size;:</term>
+      <term>Coreutils Uname Patch - <token>&coreutils-x86_uname-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -23,5 +23,5 @@
 
     <varlistentry os="gcc-specs-patch">
-      <term>GCC Specs Patch - &gcc-specs-patch-size;:</term>
+      <term>GCC Specs Patch - <token>&gcc-specs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -33,3 +33,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/x86_64-64/packages.xml
===================================================================
--- materials/x86_64-64/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/x86_64-64/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry>
-      <term>Bin86 (&bin86-version;) - &bin86-size;:</term>
+      <term>Bin86 (&bin86-version;) - <token>&bin86-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&bin86-home;"/></para>
@@ -23,5 +23,5 @@
 
     <varlistentry>
-      <term>Lilo (&lilo-version;) - &lilo-size;:</term>
+      <term>Lilo (&lilo-version;) - <token>&lilo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&lilo-home;"/></para>
@@ -33,5 +33,7 @@
   </variablelist>
 
-  <para>Total size of these packages: about 469 KB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>
Index: materials/x86_64-64/patches.xml
===================================================================
--- materials/x86_64-64/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/x86_64-64/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="bin86 x86_64-patch">
-      <term>Bin86 x86_64 Patch - &bin86-x86_64-patch-size;:</term>
+      <term>Bin86 x86_64 Patch - <token>&bin86-x86_64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -27,5 +27,5 @@
 
     <varlistentry os="gcc-pure64-patch">
-      <term>GCC Pure 64 Patch - &gcc-pure64-patch-size;:</term>
+      <term>GCC Pure 64 Patch - <token>&gcc-pure64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -36,5 +36,5 @@
 
     <varlistentry os="gcc-specs_pure64-patch">
-      <term>GCC Specs Patch - &gcc-specs_pure64-patch-size;:</term>
+      <term>GCC Specs Patch - <token>&gcc-specs_pure64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -45,5 +45,5 @@
 
     <varlistentry os="lilo-cross-x86_64-patch">
-      <term>Lilo x86_64 Cross Compile Patch - &lilo-cross-x86_64-patch-size;:</term>
+      <term>Lilo x86_64 Cross Compile Patch - <token>&lilo-cross-x86_64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -55,3 +55,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: materials/x86_64/packages.xml
===================================================================
--- materials/x86_64/packages.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/x86_64/packages.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -16,5 +16,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/packages.xml"
+  href="../common/packages.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
Index: materials/x86_64/patches.xml
===================================================================
--- materials/x86_64/patches.xml	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ materials/x86_64/patches.xml	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -14,5 +14,5 @@
 
     <varlistentry os="binutils-multilib-patch">
-      <term>Binutils Multilib Patch - &binutils-multilib-patch-size;:</term>
+      <term>Binutils Multilib Patch - <token>&binutils-multilib-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -31,5 +31,5 @@
 
     <varlistentry os="perl-multilib-patch">
-      <term>Perl Configure Multilib Patch - &perl-multilib-patch-size;:</term>
+      <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -40,5 +40,5 @@
 
     <varlistentry os="perl-lib64-patch">
-      <term>Perl Libc lib64 Patch - &perl-lib64-patch-size;:</term>
+      <term>Perl Libc lib64 Patch - <token>&perl-lib64-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
@@ -50,3 +50,7 @@
   </variablelist>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/patches.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
 </sect1>
Index: packages.ent
===================================================================
--- packages.ent	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ packages.ent	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -47,5 +47,5 @@
 
 <!ENTITY binutils-version "2.16.92">
-<!ENTITY binutils-size "13,734 KB">
+<!ENTITY binutils-size "13,374 KB">
 <!---
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
@@ -116,5 +116,5 @@
 
 <!ENTITY expect-version "5.43.0">
-<!ENTITY expect-size "416 KB">
+<!ENTITY expect-size "514 KB">
 <!ENTITY expect-url "http://expect.nist.gov/src/expect-&expect-version;.tar.gz">
 <!ENTITY expect-md5 "43e1dc0e0bc9492cf2e1a6f59f276bc3">
@@ -214,5 +214,5 @@
 
 <!ENTITY iproute2-version "2.6.16-060323">
-<!ENTITY iproute2-size "377 KB">
+<!ENTITY iproute2-size "378 KB">
 <!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz">
 <!ENTITY iproute2-md5 "f31d4516b35bbfeaa72c762f5959e97c">
@@ -246,5 +246,5 @@
 
 <!ENTITY linux-version "2.6.16.16">
-<!ENTITY linux-size "39.880 KB">
+<!ENTITY linux-size "39,880 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
 <!ENTITY linux-md5 "dfb066db24a8a9b36358fb290cb06959">
@@ -288,5 +288,5 @@
 
 <!ENTITY module-init-tools-version "3.2.2">
-<!ENTITY module-init-tools-size "165 KB">
+<!ENTITY module-init-tools-size "166 KB">
 <!ENTITY module-init-tools-url "&kernel;linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
 <!ENTITY module-init-tools-md5 "a1ad0a09d3231673f70d631f3f5040e9">
@@ -425,5 +425,5 @@
 <!ENTITY vim-md5 "4ca69757678272f718b1041c810d82d8">
 <!ENTITY vim-home "http://www.vim.org">
-<!ENTITY vim-language-size "1,152 KB">
+<!ENTITY vim-language-size "1,153 KB">
 <!ENTITY vim-language-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz">
 <!ENTITY vim-language-md5 "6d43efaff570b5c86e76b833ea0c6a04">
Index: stylesheets/xhtml/lfs-mixed.xsl
===================================================================
--- stylesheets/xhtml/lfs-mixed.xsl	(revision 3f072de83bc051a1ee2cf8ea5576cbe0a32a66f3)
+++ stylesheets/xhtml/lfs-mixed.xsl	(revision 38153904fffa33bd3bd9ad5524e1bbfcddee7ae6)
@@ -267,3 +267,56 @@
   </xsl:template>
 
+    <!-- Total packages size calculation -->
+  <xsl:template match="returnvalue">
+    <xsl:call-template name="calculation">
+     <xsl:with-param name="scope" select="../../variablelist"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="calculation">
+    <xsl:param name="scope"/>
+    <xsl:param name="total">0</xsl:param>
+    <xsl:param name="position">1</xsl:param>
+    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
+    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
+    <xsl:variable name="size" select="substring-before($token,' KB')"/>
+    <xsl:variable name="rawsize">
+      <xsl:choose>
+        <xsl:when test="contains($size,',')">
+          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$size"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$position &lt;= $tokens">
+        <xsl:call-template name="calculation">
+          <xsl:with-param name="scope" select="$scope"/>
+          <xsl:with-param name="position" select="$position +1"/>
+          <xsl:with-param name="total" select="$total + $rawsize"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$total &lt; '1000'">
+            <xsl:value-of select="$total"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:when test="$total &gt; '1000' and $total &lt; '5000'">
+            <xsl:value-of select="substring($total,1,1)"/>
+            <xsl:text>,</xsl:text>
+            <xsl:value-of select="substring($total,2)"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="round($total div 1024)"/>
+            <xsl:text>  MB</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
