diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index c917087bb..6eb478aaf 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -882,7 +882,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils. Less</seg>
+          <seg>Diffutils</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1105,7 +1105,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Gzip</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5a5388276..f012a552e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,44 +36,6 @@
     </listitem>
 
 -->
-    <listitem>
-      <para>2012-06-23</para>
-      <itemizedlist>
-         <listitem>
-           <para>[matthew] - Upgrade to XZ-5.0.4. Fixes
-           <ulink url="&lfs-ticket-root;3125">#3125</ulink>.</para>
-         </listitem>
-         <listitem>
-           <para>[matthew] - Upgrade to Kmod-9. Fixes
-           <ulink url="&lfs-ticket-root;3124">#3124</ulink>.</para>
-         </listitem>
-         <listitem>
-           <para>[matthew] - Upgrade to Psmisc-22.18. Fixes
-           <ulink url="&lfs-ticket-root;3123">#3123</ulink>.</para>
-         </listitem>
-         <listitem>
-           <para>[matthew] - Upgrade to Man-DB-2.6.2. Fixes
-           <ulink url="&lfs-ticket-root;3122">#3122</ulink>.</para>
-         </listitem>
-         <listitem>
-           <para>[matthew] - Upgrade to Gzip-1.5. Fixes
-           <ulink url="&lfs-ticket-root;3121">#3121</ulink>.</para>
-         </listitem>
-         <listitem>
-           <para>[matthew] - Upgrade to GCC-4.7.1. Fixes
-           <ulink url="&lfs-ticket-root;3117">#3117</ulink>.</para>
-         </listitem>
-         <listitem>
-           <para>[matthew] - Upgrade to E2fsprogs-1.42.4.  Fixes
-           <ulink url="&lfs-ticket-root;3116">#3116</ulink>.</para>
-         </listitem>
-         <listitem>
-           <para>[matthew] - Upgrade to Linux-3.4.3.  Fixes
-           <ulink url="&lfs-ticket-root;3114">#3114</ulink>.</para>
-         </listitem>
-      </itemizedlist>
-    </listitem>
-
     <listitem>
       <para>2012-06-17</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 29bf3024a..0b041f9a9 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -97,9 +97,9 @@
     <!--<listitem>
       <para>GRUB &grub-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gzip &gzip-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>IANA-Etc &iana-etc-version;</para>
     </listitem>-->
@@ -136,9 +136,9 @@
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Man-pages &man-pages-version;</para>
     </listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 1fa0ff71b..9ee047f98 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -58,11 +58,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 9adb42318..659934221 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -55,15 +55,6 @@
     <variablelist>
       <title>The meaning of the configure options:</title>
 
-      <varlistentry>
-        <term><parameter>PKG_CONFIG=, libpipeline_ ...</parameter></term>
-        <listitem>
-          <para>These environment variables allow the configuration 
-          process to complete without the external <command>pkg-config</command> 
-          program.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--disable-setuid</parameter></term>
         <listitem>
diff --git a/general.ent b/general.ent
index 9549f4e9e..083ffb20b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120623">
-<!ENTITY releasedate "June 23, 2012">
+<!ENTITY version "SVN-20120617">
+<!ENTITY releasedate "June 17, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 596e2859e..24c9b011e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -107,10 +107,10 @@
 <!-- NOTE: When updating e2fsprogs, remember to check the list
      of acceptable features that can be shown by debugfs in
      chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.42.4">
-<!ENTITY e2fsprogs-size "5,736 KB">
+<!ENTITY e2fsprogs-version "1.42.3">
+<!ENTITY e2fsprogs-size "5,681 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "b6e296f210d642361b7394437ff0f318">
+<!ENTITY e2fsprogs-md5 "73431146f58d40fe1375aba2060f0da8">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "45 MB">
 <!ENTITY e2fsprogs-ch6-sbu "0.5 SBU">
@@ -166,10 +166,10 @@
 <!ENTITY gawk-ch6-du "28 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.7.1">
-<!ENTITY gcc-size "80,703 KB">
+<!ENTITY gcc-version "4.7.0">
+<!ENTITY gcc-size "80,585 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "933e6f15f51c031060af64a9e14149ff">
+<!ENTITY gcc-md5 "2a0f1d99fda235c29d40b561f81d9a77">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "1.2 GB">
 <!ENTITY gcc-ch5p1-sbu "5.0 SBU">
@@ -244,10 +244,10 @@
 <!ENTITY grub-ch6-du "76 MB">
 <!ENTITY grub-ch6-sbu "0.6 SBU">
 
-<!ENTITY gzip-version "1.5">
-<!ENTITY gzip-size "704 KB">
-<!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.xz">
-<!ENTITY gzip-md5 "2a431e169b6f62f7332ef6d47cc53bae">
+<!ENTITY gzip-version "1.4">
+<!ENTITY gzip-size "886 KB">
+<!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.gz">
+<!ENTITY gzip-md5 "e381b8506210c794278f5527cba0e765">
 <!ENTITY gzip-home "&gnu-software;gzip/">
 <!ENTITY gzip-ch5-du "3.3 MB">
 <!ENTITY gzip-ch5-sbu "less than 0.1 SBU">
@@ -286,10 +286,10 @@
 <!ENTITY kbd-ch6-du "21.0 MB">
 <!ENTITY kbd-ch6-sbu "0.2 SBU">
 
-<!ENTITY kmod-version "9">
-<!ENTITY kmod-size "1,096 KB">
+<!ENTITY kmod-version "8">
+<!ENTITY kmod-size "964 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "c8ae2d2694fbca2b28e238b30543a0cd">
+<!ENTITY kmod-md5 "d4e3d038b5370b1e8ff237c55666aa64">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "16.0 MB">
 <!ENTITY kmod-ch6-sbu "less than 0.1 SBU">
@@ -328,12 +328,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "4">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "1">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "65,189 KB">
+<!ENTITY linux-size "65,183 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "d13125cf34b340e20dd4e54ca88c3b35">
+<!ENTITY linux-md5 "4e582a5b758d80af5ec766d8d56bf597">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "540 - 800 MB">
 <!ENTITY linux-ch8-sbu "1.0 - 5.0 SBU">
@@ -363,10 +363,10 @@
 <!ENTITY make-ch6-du "9.7 MB">
 <!ENTITY make-ch6-sbu "0.3 SBU">
 
-<!ENTITY man-db-version "2.6.2">
-<!ENTITY man-db-size "1,353 KB">
-<!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "647c48d46c464419185d031d04481ee5">
+<!ENTITY man-db-version "2.6.1">
+<!ENTITY man-db-size "2,449 KB">
+<!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.gz">
+<!ENTITY man-db-md5 "79658e8695c7b9b3be1ee340d78a4692">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "22 MB">
 <!ENTITY man-db-ch6-sbu "0.4 SBU">
@@ -453,10 +453,10 @@
 <!ENTITY procps-ch6-du "2.3 MB">
 <!ENTITY procps-ch6-sbu "0.1 SBU">
 
-<!ENTITY psmisc-version "22.18">
-<!ENTITY psmisc-size "481 KB">
+<!ENTITY psmisc-version "22.17">
+<!ENTITY psmisc-size "489 KB">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "bdcf4bf372f9f4f9f0e11864d3b773a1">
+<!ENTITY psmisc-md5 "634e0f7c3b3dde22ea879e6279c9ec61">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
 <!ENTITY psmisc-ch6-du "3.6 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
@@ -563,10 +563,10 @@
 <!ENTITY vim-ch6-du "87 MB">
 <!ENTITY vim-ch6-sbu "1.0 SBU">
 
-<!ENTITY xz-version "5.0.4">
-<!ENTITY xz-size "894 KB">
-<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "161015c4a65b1f293d31810e1df93090">
+<!ENTITY xz-version "5.0.3">
+<!ENTITY xz-size "1,002 KB">
+<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.bz2">
+<!ENTITY xz-md5 "8d900b742b94fa9e708ca4f5a4b29003">
 <!ENTITY xz-home "http://tukaani.org/xz">
 <!ENTITY xz-ch5-du "14 MB">
 <!ENTITY xz-ch5-sbu "0.3 SBU">