diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 535566847..64c63c95a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -54,7 +54,7 @@
         </listitem>
         <listitem>
           <para>[bdubbs] - Update to linux-4.4.4. Fixes
-          <ulink url="&lfs-ticket-root;3803">#3893</ulink>.</para>
+          <ulink url="&lfs-ticket-root;3893">#3893</ulink>.</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - Update to pkg-config-0.29.1. Fixes
@@ -62,20 +62,20 @@
         </listitem>
         <listitem>
           <para>[bdubbs] - Update to tcl-6.8.5. Fixes
-          <ulink url="&lfs-ticket-root;3808">#3898</ulink>.</para>
+          <ulink url="&lfs-ticket-root;3898">#3898</ulink>.</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - Remove --disable-profile from Glibc instructions. Fixes
-          <ulink url="&lfs-ticket-root;3805">#3895</ulink>.</para>
+          <ulink url="&lfs-ticket-root;3895">#3895</ulink>.</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - Create /var/log/faillog. Fixes
-          <ulink url="&lfs-ticket-root;3809">#3899</ulink>.</para>
+          <ulink url="&lfs-ticket-root;3899">#3899</ulink>.</para>
         </listitem>
         <listitem>
           <para>[bdubbs] - Remove --enable-obsolete-rpc from Chapter 5 
           glibc. Fixes
-          <ulink url="&lfs-ticket-root;3809">#3899</ulink>.</para>
+          <ulink url="&lfs-ticket-root;3900">#3900</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index c1a10e827..519811692 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -53,7 +53,7 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>This takes a long time, about &autoconf-ch6-sbu; SBUs. In addition,
+    <para>This takes a long time, about &autoconf-ch6-sbu-tests; SBUs. In addition,
     several tests are skipped that use Automake. For full test coverage,
     Autoconf can be re-tested after Automake has been installed.  In addition,
     two fail due to changes in libtool-2.4.3 and later.</para>
diff --git a/packages.ent b/packages.ent
index ef80c3d12..80dd575d3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -28,7 +28,8 @@
 <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-ch6-du "17.3 MB">
-<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about 3.6 SBU with tests)">
+<!ENTITY autoconf-ch6-sbu-tests "3.6">
+<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about &autoconf-ch6-sbu-tests; SBU with tests)">
 
 <!ENTITY automake-version "1.15">
 <!ENTITY am-minor-version "1.15">