Index: general/genlib/expat/expat-inst.xml
===================================================================
--- general/genlib/expat/expat-inst.xml	(revision 9491ec6bae77a8e8b8ec7a67836e736ca41d50e0)
+++ general/genlib/expat/expat-inst.xml	(revision c38707f017cc195dae3f13262d6f991bcceecf68)
@@ -5,5 +5,5 @@
 first use.  This is corrected by the following patch:</para>
 
-<screen><userinput><command>patch -Np1 -i ../expat-1.95.6.patch</command></userinput></screen>
+<screen><userinput><command>patch -Np1 -i ../expat-1.95.6-fix-declaration-order.patch</command></userinput></screen>
 
 <para>Install <application>expat</application> by running the following commands:</para>
Index: general/genlib/expat/expat-intro.xml
===================================================================
--- general/genlib/expat/expat-intro.xml	(revision 9491ec6bae77a8e8b8ec7a67836e736ca41d50e0)
+++ general/genlib/expat/expat-intro.xml	(revision c38707f017cc195dae3f13262d6f991bcceecf68)
@@ -14,5 +14,5 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink url="&hfile-root;/expat-&expat-version;.patch"/></para></listitem></itemizedlist></sect3>
+<listitem><para>Required Patch: <ulink url="&patch-root;/expat-&expat-version;-fix-declaration-order.patch"/></para></listitem></itemizedlist></sect3>
 
 </sect2>
Index: general/genutils/bc/bc-inst.xml
===================================================================
--- general/genutils/bc/bc-inst.xml	(revision 9491ec6bae77a8e8b8ec7a67836e736ca41d50e0)
+++ general/genutils/bc/bc-inst.xml	(revision c38707f017cc195dae3f13262d6f991bcceecf68)
@@ -2,10 +2,9 @@
 <title>Installation of <command>bc</command></title>
 
-<para>Download the patches for <command>bc</command> from <ulink url="&hfile-root;"/>.</para>
+<para>Download the patches for <command>bc</command> from <ulink url="&patch-root;"/>.</para>
 
 <para>Install <command>bc</command> by running the following commands:</para>
 
 <screen><userinput><command>patch -Np1 -i ../bc-1.06-flex-invocation.patch &amp;&amp;
-patch -Np1 -i ../bc-1.06-info.patch &amp;&amp;
 patch -Np1 -i ../bc-1.06-readline.patch &amp;&amp;
 ./configure --prefix=/usr --with-readline &amp;&amp;
Index: general/graphlib/svgalib/svgalib-intro.xml
===================================================================
--- general/graphlib/svgalib/svgalib-intro.xml	(revision 9491ec6bae77a8e8b8ec7a67836e736ca41d50e0)
+++ general/graphlib/svgalib/svgalib-intro.xml	(revision c38707f017cc195dae3f13262d6f991bcceecf68)
@@ -17,5 +17,5 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&hfile-root;/svgalib-1.4.3-vga.patch"/></para></listitem>
+<listitem><para>Download (HTTP): <ulink url="&patch-root;/svga-1.4.3-gcc33-1.patch"/></para></listitem>
 </itemizedlist></sect3>
 
Index: general/sysutils/gpm/gpm-inst.xml
===================================================================
--- general/sysutils/gpm/gpm-inst.xml	(revision 9491ec6bae77a8e8b8ec7a67836e736ca41d50e0)
+++ general/sysutils/gpm/gpm-inst.xml	(revision c38707f017cc195dae3f13262d6f991bcceecf68)
@@ -2,5 +2,5 @@
 <title>Installation of <application><acronym>GPM</acronym></application></title>
 
-<para>Download the patches for <application><acronym>GPM</acronym></application> from <ulink url="&hfile-root;"/>.</para>
+<para>Download the patches for <application><acronym>GPM</acronym></application> from <ulink url="&patch-root;"/>.</para>
 
 <para>Install <application><acronym>GPM</acronym></application> by running the following commands:
@@ -10,6 +10,5 @@
     configuring <application>gpm</application>.</para></note> -->
     
-<screen><userinput><command>patch -Np0 -i ../gpm-1.20.1-smooth-cursor.patch &amp;&amp;
-patch -Np1 -i ../gpm-1.20.1-segfault.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../gpm-1.20.1-segfault.patch &amp;&amp;
 patch -Np1 -i ../gpm-1.20.1-silent.patch &amp;&amp;
 LDFLAGS="-lm" ./configure --prefix=/usr &amp;&amp;
