Index: materials/common/patches.xml
===================================================================
--- materials/common/patches.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/common/patches.xml	(revision ed3b725a30a4614f711fbafcddba8ca29043e6e9)
@@ -20,5 +20,5 @@
 
     <varlistentry>
-      <term>Bash Fixes Patch - 23 KB:</term>
+      <term>Bash Fixes Patch - &bash-fixes-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -28,5 +28,5 @@
 
     <varlistentry>
-      <term>Binutils Posix Patch - 4.9 KB:</term>
+      <term>Binutils Posix Patch - &binutils-posix-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -36,5 +36,21 @@
 
     <varlistentry>
-      <term>Bzip2 Bzgrep Security Fixes Patch - 1.3 KB:</term>
+      <term>Bzip2 Documentation Patch - &bzip2-docs-patch-size;:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;bzip2/&bzip2-docs-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Bzip2 Bzdiff Remove Tempfile - &bzip2-remove_tempfile-patch-size;:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;bzip2/&bzip2-remove_tempfile-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Bzip2 Bzgrep Security Fixes Patch - &bzip2-bzgrep-patch;:</term>
       <listitem>
         <para><ulink
@@ -44,21 +60,5 @@
 
     <varlistentry>
-      <term>Bzip2 Bzdiff Remove Tempfile - 1.8 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;bzip2/&bzip2-remove_tempfile-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bzip2 Documentation Patch - 1.7 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;bzip2/&bzip2-docs-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Coreutils Suppress Uptime, Kill, Su Patch - 13 KB:</term>
+      <term>Coreutils Suppress Uptime, Kill, Su Patch - &coreutils-suppress-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -68,5 +68,5 @@
 
     <varlistentry>
-      <term>Expect Spawn Patch - 6.9 KB:</term>
+      <term>Expect Spawn Patch - &expect-spawn-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -76,5 +76,5 @@
 
     <varlistentry>
-      <term>Gawk Segfault Patch - 1.3 KB:</term>
+      <term>Gawk Segfault Patch - &gawk-segfault-patch-size;B:</term>
       <listitem>
         <para><ulink
@@ -84,5 +84,5 @@
 
     <varlistentry>
-      <term>GCC Cross Search Paths Patch - 2 KB:</term>
+      <term>GCC Cross Search Paths Patch - &gcc-cross_search-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -92,5 +92,5 @@
 
     <varlistentry>
-      <term>GCC PR20425 Patch - 37 KB:</term>
+      <term>GCC PR20425 Patch - &gcc-PR20425-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -100,5 +100,5 @@
 
     <varlistentry>
-      <term>GCC PR26763 Patch - 3.1 KB:</term>
+      <term>GCC PR26763 Patch - &gcc-PR26763-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -108,5 +108,5 @@
 
     <varlistentry>
-      <term>GCC Posix Patch - 9 KB:</term>
+      <term>GCC Posix Patch - &gcc-specs-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -116,5 +116,5 @@
 
     <varlistentry>
-      <term>Glibc Disable linking with libgcc_eh.a - 1 KB:</term>
+      <term>Glibc Disable linking with libgcc_eh.a - &glibc-libgcc_eh-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -124,5 +124,5 @@
 
     <varlistentry>
-      <term>Glibc Localedef Segfault - 1.9 KB:</term>
+      <term>Glibc Localedef Segfault - &glibc-localedef_segfault-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -132,5 +132,5 @@
 
     <varlistentry>
-      <term>Gzip Security Fix Patch - 2 KB:</term>
+      <term>Gzip Security Fix Patch - &gzip-security_fix-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -140,5 +140,5 @@
 
     <varlistentry>
-      <term>Inetutils GCC 4.x Fixes Patch - 1.3 KB:</term>
+      <term>Inetutils GCC 4.x Fixes Patch - &inetutils-man_pages-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -148,5 +148,5 @@
 
     <varlistentry>
-      <term>Inetutils No-Server-Man-Pages Patch - 4.1 KB:</term>
+      <term>Inetutils No-Server-Man-Pages Patch - &inetutils-gcc4_fixes-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -156,5 +156,5 @@
 
     <varlistentry>
-      <term>KBD GCC 4.x Fixes Patch - 1.5 KB:</term>
+      <term>KBD GCC 4.x Fixes Patch - &kbd-gcc4_fixes-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -164,5 +164,5 @@
 
     <varlistentry>
-      <term>Mktemp Tempfile Patch - 3.6 KB:</term>
+      <term>Mktemp Tempfile Patch - &mktemp-tempfile-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -172,5 +172,5 @@
 
     <varlistentry>
-      <term>Perl Libc Patch - 1.1 KB:</term>
+      <term>Perl Libc Patch - &perl-libc-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -180,5 +180,5 @@
 
     <varlistentry>
-      <term>Readline Fixes Patch - 2.1 KB:</term>
+      <term>Readline Fixes Patch - &readline-fixes-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -188,5 +188,5 @@
 
     <varlistentry>
-      <term>Sysklogd Fixes Patch - 28 KB:</term>
+      <term>Sysklogd Fixes Patch - &sysklogd-fixes-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -196,5 +196,5 @@
 
     <varlistentry>
-      <term>Tar GCC-4.x Fix Patch - 1.2 KB:</term>
+      <term>Tar GCC-4.x Fix Patch - &tar-gcc4_fix-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -204,5 +204,5 @@
 
     <varlistentry>
-      <term>Tar Security Fix Patch - 3.9 KB:</term>
+      <term>Tar Security Fix Patch - &tar-security_fixes-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -212,5 +212,5 @@
 
     <varlistentry>
-      <term>Tar Sparse Fix Patch - 1 KB:</term>
+      <term>Tar Sparse Fix Patch - &tar-sparse_fix-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -220,5 +220,5 @@
 
     <varlistentry>
-       <term>Texinfo Tempfile Fix Patch - 2.2 KB:</term>
+       <term>Texinfo Tempfile Fix Patch - &texinfo-tempfile_fix-patch-size;:</term>
        <listitem>
           <para><ulink url="&patches-root;texinfo/&texinfo-tempfile_fix-patch;"/></para>
@@ -227,5 +227,5 @@
 
     <varlistentry>
-      <term>Util-linux Cramfs Patch - 2.8 KB:</term> <listitem>
+      <term>Util-linux Cramfs Patch - &util-linux-cramfs-patch-size;:</term> <listitem>
         <para><ulink
         url="&patches-root;util-linux/&util-linux-cramfs-patch;"/></para>
@@ -234,5 +234,5 @@
 
     <varlistentry>
-      <term>Util-linux GCC 4.x Patch - 1 KB:</term> <listitem>
+      <term>Util-linux GCC 4.x Patch - &util-linux-gcc4_fixes-patch-size;:</term> <listitem>
         <para><ulink
         url="&patches-root;util-linux/&util-linux-gcc4_fixes-patch;"/></para>
@@ -241,5 +241,5 @@
 
     <varlistentry>
-      <term>Vim Fixes Patch - 17 KB:</term>
+      <term>Vim Fixes Patch - &vim-fixes-patch-size;:</term>
       <listitem>
         <para><ulink
@@ -249,5 +249,5 @@
 
     <varlistentry>
-      <term>Zlib fPIC Patch - 3.2 KB:</term> <listitem>
+      <term>Zlib fPIC Patch - &zlib-fpic-patch-size;:</term> <listitem>
         <para><ulink
         url="&patches-root;zlib/&zlib-fpic-patch;"/></para>
