Index: general/genlib/guile.xml
===================================================================
--- general/genlib/guile.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ general/genlib/guile.xml	(revision 23b0c17b74ee7bb40e914cebf70bae5edaa63a34)
@@ -5,5 +5,4 @@
 &guile-intro;
 &guile-inst;
-&guile-config;
 &guile-desc;
 
Index: general/genlib/guile/guile-desc.xml
===================================================================
--- general/genlib/guile/guile-desc.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ general/genlib/guile/guile-desc.xml	(revision 23b0c17b74ee7bb40e914cebf70bae5edaa63a34)
@@ -2,8 +2,9 @@
 <title>Contents</title>
 
-<para>In addition to the <filename>libguile</filename> libraries, the Guile package contains
-<userinput>guile</userinput>,
-<userinput>guile-config</userinput> and 
-<userinput>guile-snarf</userinput>.
+<para>In addition to the <filename>libguile</filename> libraries, the
+<application>Guile</application> package contains
+<command>guile</command>,
+<command>guile-config</command> and 
+<command>guile-snarf</command>.
 </para>
 
@@ -13,15 +14,18 @@
 
 <sect3><title>guile</title>
-<para>guile is a stand-alone scheme interpreter for Guile.</para></sect3>
+<para><command>guile</command> is a stand-alone scheme interpreter for
+<application>Guile</application>.</para></sect3>
 
 <sect3><title>guile-config</title>
-<para>guile-config is a Guile script which provides the information
-necessary to link your programs against the Guile
-library, in much the same way <xref linkend="pkgconfig"></xref>
-does.</para></sect3>
+<para><command>guile-config</command> is a <application>Guile</application> 
+script which provides the information necessary to link your programs against 
+the <application>Guile</application> library, in much the same way <xref 
+linkend="pkgconfig"></xref> does.</para></sect3>
 
 <sect3><title>guile-snarf</title>
-<para>guile-snarf a script to parse declarations in your C code for
-Scheme-visible C functions, Scheme objects to be used by C code,
+<para><command>guile-snarf</command> a script to parse declarations in
+your <application>C</application> code for <application>Scheme</application> 
+visible <application>C</application> functions, <application>Scheme
+</application> objects to be used by <application>C</application> code,
 etc.</para></sect3> 
 
Index: general/genlib/guile/guile-inst.xml
===================================================================
--- general/genlib/guile/guile-inst.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ general/genlib/guile/guile-inst.xml	(revision 23b0c17b74ee7bb40e914cebf70bae5edaa63a34)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of Guile</title>
+<title>Installation of <application>Guile</application></title>
 
-<para>Install Guile by running the following commands:</para>
+<para>Install <application>Guile</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/guile/guile-intro.xml
===================================================================
--- general/genlib/guile/guile-intro.xml	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ general/genlib/guile/guile-intro.xml	(revision 23b0c17b74ee7bb40e914cebf70bae5edaa63a34)
@@ -1,16 +1,26 @@
 <sect2>
-<title>Introduction to Guile</title>
+<title>Introduction to <application>Guile</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&guile-download-http;"/>
-Download location (FTP):        <ulink url="&guile-download-ftp;"/>
-Version used:                   &guile-version;
-Package size:                   &guile-size;
-Estimated Disk space required:  &guile-buildsize;</screen>
+<para>The <application>Guile</application> package contains the Project GNU's 
+extension language library.  <application>Guile</application> also contains a 
+stand alone <application>Scheme</application> interpreter.</para>
 
-<para>The Guile package contains the Project GNU's extension language
-library.  Guile also contains a stand alone Scheme interpreter.</para>
-
-<screen>Guile will utilize:
-<xref linkend="readline"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&guile-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&guile-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &guile-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&guile-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&guile-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Guile</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="readline"/></para></sect4>
+</sect3>
 
 </sect2>
Index: general/genlib/guile/guile.ent
===================================================================
--- general/genlib/guile/guile.ent	(revision 5259206dfd63f63eb029849e81134348fe4d5fb7)
+++ general/genlib/guile/guile.ent	(revision 23b0c17b74ee7bb40e914cebf70bae5edaa63a34)
@@ -5,8 +5,8 @@
 <!ENTITY guile-desc SYSTEM "guile-desc.xml">
 <!ENTITY guile-config SYSTEM "guile-config.xml">
-<!ENTITY guile-buildsize "12 MB">
-<!ENTITY guile-version "1.4.1">
+<!ENTITY guile-buildsize "30 MB">
+<!ENTITY guile-version "1.6.4">
 <!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-size "1.4 MB">
-<!ENTITY guile-time "1.42 SBU">
+<!ENTITY guile-size "2.7 MB">
+<!ENTITY guile-time "0.79 SBU">
