Index: materials/common/patches.xml
===================================================================
--- materials/common/patches.xml	(revision 18b630f3daadfaecae71d211ef9a09aeec2a9f7d)
+++ 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
