Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision ea804bc35627aced690e2637b54558ff393ae3ff)
+++ general/prog/guile.xml	(revision dcd55b37743ea90133c8a910f3fba48605bf706d)
@@ -7,8 +7,8 @@
   <!ENTITY guile-download-http "http://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
   <!ENTITY guile-download-ftp  "ftp://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
-  <!ENTITY guile-md5sum        "c2ff2a2231f0cbb2e838dd8701a587c5">
-  <!ENTITY guile-size          "3.0 MB">
-  <!ENTITY guile-buildsize     "39.6 MB (additional 32.2 MB to install all the docs)">
-  <!ENTITY guile-time          "1.1 SBU (includes building all documentation)">
+  <!ENTITY guile-md5sum        "a4b64a992deae0532f8015bcc6c40784">
+  <!ENTITY guile-size          "3.7 MB">
+  <!ENTITY guile-buildsize     "49 MB (additional 40 MB to install all the docs)">
+  <!ENTITY guile-time          "1.2 SBU (includes building all documentation)">
 ]>
 
@@ -56,5 +56,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -66,12 +66,10 @@
         url="&patch-root;/guile-&guile-version;-slib-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">Guile Dependencies</bridgehead>
 
-    <!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gmp"/></para>
-    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -89,10 +87,12 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../guile-&guile-version;-gcc4-1.patch &amp;&amp;
-patch -Np1 -i ../guile-&guile-version;-slib-1.patch &amp;&amp;
-./configure --prefix=/usr --with-threads &amp;&amp;
+<screen><userinput>sed -i -e '20,$ d' \
+       -e 's|slib)|&amp;)\n(load-from-path "slib/guile.init")|' \
+    ice-9/slib.scm
+
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>If you have <application>teTeX</application> installed and wish to
+    <para>If you have <xref linkend="tetex"/> installed and wish to
     build alternate formats of the documentation, issue the following
     commands:</para>
@@ -102,4 +102,5 @@
   make -k -C doc/$DIRNAME pdf ps html
 done &amp;&amp;
+
 makeinfo --plaintext -o doc/goops/goops.txt doc/goops/goops.texi &amp;&amp;
 makeinfo --plaintext -o doc/r5rs/r5rs.txt doc/r5rs/r5rs.texi &amp;&amp;
@@ -107,4 +108,5 @@
 makeinfo --plaintext -o doc/tutorial/guile-tut.txt \
     doc/tutorial/guile-tut.texi &amp;&amp;
+
 unset DIRNAME</userinput></screen>
 
@@ -114,9 +116,10 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 find examples -name "Makefile*" -exec rm {} \; &amp;&amp;
 install -v -m755 -d /usr/share/doc/guile-&guile-version; &amp;&amp;
-cp -v -R examples /usr/share/doc/guile-&guile-version;</userinput></screen>
-
-    <para>If you built the alternate formats of the documentation, install it
+cp -v -R examples   /usr/share/doc/guile-&guile-version;</userinput></screen>
+
+    <para>If you built the alternate formats of the documentation, install them
     using the following commands issued by the
     <systemitem class="username">root</systemitem> user:</para>
@@ -141,4 +144,16 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i -e '20,$ d' -e '...' ice-9/slib.scm</command>:
+    This command is used to modify the <application>Guile</application>
+    <application>SLIB</application> initialization script. There are
+    incompatibilities with newer versions of <application>SLIB</application>
+    and this command modifes the script to use the installed
+    <application>SLIB</application> script.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -151,11 +166,6 @@
       <seglistitem>
         <seg>guile, guile-config, guile-snarf, and guile-tools</seg>
-        <seg>libguile-ltdl.{so,a}, libguile-srfi-srfi-13-14-v-1.{so,a},
-        libguile-srfi-srfi-4-v-1.{so,a}, libguile.{so,a},
-        /libguilereadline-v-12.{so,a} and libqthreads.{so,a}</seg>
-        <!-- <seg>libguile.{so,a}, libguilereadline-v-17.{so,a},
-        libguile-srfi-srfi-13-14-v-3.{so,a}, libguile-srfi-srfi-1-v-3.{so,a},
-        libguile-srfi-srfi-4-v-3.{so,a} and
-        libguile-srfi-srfi-60-v-2.{so,a}</seg>-->
+        <seg>libguile.{so,a}, libguile-srfi-srfi-*.{so,a} and
+        /libguilereadline-v-17.{so,a}</seg>
         <seg>/usr/include/guile, /usr/include/libguile,
         /usr/share/doc/guile-&guile-version; and /usr/share/guile</seg>
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision ea804bc35627aced690e2637b54558ff393ae3ff)
+++ general/prog/pdl.xml	(revision dcd55b37743ea90133c8a910f3fba48605bf706d)
@@ -234,5 +234,7 @@
             <ulink url="http://www.boutell.com/gd/">GD</ulink>,
             <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
-            <xref linkend="gnome-libs"/>,
+            <!-- <xref linkend="gnome-libs"/>, -->
+            <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gnome-libs/1.4/">GNOME
+            Libraries-1.4</ulink>,
             <xref linkend="jdk"/>,
             <xref linkend="tk"/>,
