Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision fd8ef110375ad49b202e62cf6f10ed3ab38b5781)
+++ chapter01/changelog.xml	(revision c5be6346ba51965f9ee82804089ba6c606c7e038)
@@ -37,4 +37,33 @@
 -->
     <listitem>
+      <para>2014-05-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update several URLs in Chapter 3. Fixes
+          <ulink url="&lfs-ticket-root;3570">#3570</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix typo in Chapter 5, libstdc++. Fixes
+          <ulink url="&lfs-ticket-root;3564">#3564</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Removed obsolete reference to acinstall
+          in automake section. Fixes
+          <ulink url="&lfs-ticket-root;3567">#3567</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Removed obsolete reference to sbu home page
+          in Chapter 4. Fixes
+          <ulink url="&lfs-ticket-root;3568">#3568</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update installed programs for gdbm. 
+          Thanks to Chris Staub for the patch.  Fixes
+          <ulink url="&lfs-ticket-root;3560">#3560</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-04-28</para>
       <itemizedlist>
Index: chapter04/aboutsbus.xml
===================================================================
--- chapter04/aboutsbus.xml	(revision fd8ef110375ad49b202e62cf6f10ed3ab38b5781)
+++ chapter04/aboutsbus.xml	(revision c5be6346ba51965f9ee82804089ba6c606c7e038)
@@ -37,7 +37,4 @@
   numbers can vary by as much as dozens of minutes in some cases.</para>
 
-  <para>To view actual timings for a number of specific machines, we recommend
-  The LinuxFromScratch SBU Home Page at <ulink url="&lfs-root;~sbu/"/>.</para>
-
   <note><para>For many modern systems with multiple processors (or cores) the
   compilation time for a package can be reduced by performing a "parallel make"
Index: chapter05/libstdc++.xml
===================================================================
--- chapter05/libstdc++.xml	(revision fd8ef110375ad49b202e62cf6f10ed3ab38b5781)
+++ chapter05/libstdc++.xml	(revision c5be6346ba51965f9ee82804089ba6c606c7e038)
@@ -94,5 +94,5 @@
 
       <varlistentry>
-        <term><parameter>--with-gxx-include-dir=/tools/include/c++/&gcc-version;</parameter></term>
+        <term><parameter>--with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</parameter></term>
         <listitem>
           <para>This is the location where the standard include files are
Index: chapter06/automake.xml
===================================================================
--- chapter06/automake.xml	(revision fd8ef110375ad49b202e62cf6f10ed3ab38b5781)
+++ chapter06/automake.xml	(revision c5be6346ba51965f9ee82804089ba6c606c7e038)
@@ -74,5 +74,5 @@
 
       <seglistitem>
-        <seg>acinstall, aclocal, aclocal-&am-minor-version;, automake,
+        <seg>aclocal, aclocal-&am-minor-version;, automake,
         automake-&am-minor-version;, compile, config.guess, config.sub,
         depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
@@ -87,14 +87,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="acinstall">
-        <term><command>acinstall</command></term>
-        <listitem>
-          <para>A script that installs aclocal-style M4 files</para>
-          <indexterm zone="ch-system-automake acinstall">
-            <primary sortas="b-acinstall">acinstall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="aclocal">
Index: chapter06/gdbm.xml
===================================================================
--- chapter06/gdbm.xml	(revision fd8ef110375ad49b202e62cf6f10ed3ab38b5781)
+++ chapter06/gdbm.xml	(revision c5be6346ba51965f9ee82804089ba6c606c7e038)
@@ -83,5 +83,5 @@
 
       <seglistitem>
-        <seg>testgdbm</seg>
+        <seg>gdbm_dump, gdbm_load, and gdbmtool</seg>
         <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
       </seglistitem>
@@ -93,10 +93,30 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="testgdbm">
-        <term><command>testgdbm</command></term>
+      <varlistentry id="gdbm_dump">
+        <term><command>gdbm_dump</command></term>
+        <listitem>
+          <para>Dumps a GDBM database to a file.</para>
+          <indexterm zone="ch-system-gdbm gdbm_dump">
+            <primary sortas="b-gdbm_dump">gdbm_dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gdbm_load">
+        <term><command>gdbm_load</command></term>
+        <listitem>
+          <para>Recreates a GDBM database from a dump file.</para>
+          <indexterm zone="ch-system-gdbm gdbm_load">
+            <primary sortas="b-gdbm_load">gdbm_load</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gdbmtool">
+        <term><command>gdbmtool</command></term>
         <listitem>
           <para>Tests and modifies a GDBM database</para>
-          <indexterm zone="ch-system-gdbm testgdbm">
-            <primary sortas="b-testgdbm">testgdbm</primary>
+          <indexterm zone="ch-system-gdbm gdbmtool">
+            <primary sortas="b-gdbmtool">gdbmtool</primary>
           </indexterm>
         </listitem>
@@ -113,4 +133,14 @@
       </varlistentry>
 
+      <varlistentry id="libgdbm_compat">
+        <term><filename class="libraryfile">libgdbm_compat</filename></term>
+        <listitem>
+          <para>Compatibility library containing older DBM functions</para>
+          <indexterm zone="ch-system-gdbm libgdbm_compat">
+            <primary sortas="c-libgdbm_compat">libgdbm_compat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: general.ent
===================================================================
--- general.ent	(revision fd8ef110375ad49b202e62cf6f10ed3ab38b5781)
+++ general.ent	(revision c5be6346ba51965f9ee82804089ba6c606c7e038)
@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20140428">
+<!ENTITY version         "SVN-20140502">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "April 28, 2014">
+<!ENTITY releasedate     "May 2, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.0">
Index: packages.ent
===================================================================
--- packages.ent	(revision fd8ef110375ad49b202e62cf6f10ed3ab38b5781)
+++ packages.ent	(revision c5be6346ba51965f9ee82804089ba6c606c7e038)
@@ -63,5 +63,5 @@
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
-<!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
+<!ENTITY binutils-home "$gnu-software;binutils/">
 <!ENTITY binutils-ch5p1-du "404 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -142,5 +142,5 @@
 <!ENTITY e2fsprogs-version "1.42.9">
 <!ENTITY e2fsprogs-size "5,928 KB">
-<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
+<!ENTITY e2fsprogs-url "http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
 <!ENTITY e2fsprogs-md5 "3f8e41e63b432ba114b33f58674563f7">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
@@ -306,5 +306,5 @@
 <!ENTITY iana-etc-version "2.30">
 <!ENTITY iana-etc-size "201 KB">
-<!ENTITY iana-etc-url "&anduin-sources;/iana-etc/iana-etc-&iana-etc-version;.tar.bz2">
+<!ENTITY iana-etc-url "&anduin-sources;iana-etc/iana-etc-&iana-etc-version;.tar.bz2">
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
 <!ENTITY iana-etc-home "http://freshmeat.net/projects/iana-etc/">
@@ -445,5 +445,5 @@
 <!ENTITY man-pages-version "3.65">
 <!ENTITY man-pages-size "1,200 KB">
-<!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
+<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
 <!ENTITY man-pages-md5 "0f165e0ab25ff5687d2d0b237af77b74">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
@@ -475,5 +475,5 @@
 <!ENTITY ncurses-url "http://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "8cb9c412e5f2d96bc6f459aa8c6282a1">
-<!ENTITY ncurses-home "http://www.gnu.org/software/ncurses/">
+<!ENTITY ncurses-home "&gnu-software;ncurses/">
 <!ENTITY ncurses-ch5-du "35 MB">
 <!ENTITY ncurses-ch5-sbu "0.5 SBU">
@@ -511,5 +511,5 @@
 <!ENTITY procps-ng-version "3.3.9">
 <!ENTITY procps-ng-size "548 KB">
-<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
+<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz/">
 <!ENTITY procps-ng-md5 "0980646fa25e0be58f7afb6b98f79d74">
 <!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
@@ -519,5 +519,5 @@
 <!ENTITY psmisc-version "22.21">
 <!ENTITY psmisc-size "447 KB">
-<!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
+<!ENTITY psmisc-url "http://downloads.sourceforge.net/project/psmisc/psmisc/psmisc-&psmisc-version;.tar.gz">
 <!ENTITY psmisc-md5 "935c0fd6eb208288262b385fa656f1bf">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
@@ -580,5 +580,5 @@
 <!ENTITY tcl-major-version "8.6">
 <!ENTITY tcl-size "8,551 KB">
-<!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
+<!ENTITY tcl-url "http://downloads.sourceforge.net/project/tcl/Tcl/&tcl-version;/tcl&tcl-version;-src.tar.gz">
 <!ENTITY tcl-md5 "aae4b701ee527c6e4e1a6f9c7399882e">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
@@ -622,5 +622,5 @@
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.24/util-linux-&util-linux-version;.tar.xz">
 <!ENTITY util-linux-md5 "3f191727a0d28f7204b755cf1b6ea0aa">
-<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
+<!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "89 MB">
 <!ENTITY util-linux-ch5-sbu "0.6 SBU">
