diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index a2eb6c439..a9ee10ef6 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-17 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Only mount /run in mountvirtfs if it is not already mounted
+     (from an initrd).
+   * Force the /dev/shm->/run/shm symlink
+   * Skip making LVM virtual groups unavailable at shutdown
+     because the / or swap partitions may be still in use.
+
 2012-05-30 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Copy all entries in /lib/udev/devices to /dev in mounvirtfs
 
diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs
index 0d3f2c78d..47c21bc33 100644
--- a/bootscripts/lfs/init.d/mountfs
+++ b/bootscripts/lfs/init.d/mountfs
@@ -66,7 +66,8 @@ case "${1}" in
       evaluate_retval
 
       # Make all LVM volume groups unavailable, if appropriate
-      if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi
+      # This fails if swap or / are on an LVM partition
+      #if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi
       ;;
 
    *)
diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs
index fab73d5b6..6130c0198 100644
--- a/bootscripts/lfs/init.d/mountvirtfs
+++ b/bootscripts/lfs/init.d/mountvirtfs
@@ -32,7 +32,10 @@
 case "${1}" in
    start)
       # Make sure /run/var is available before logging any messages
-      mount -n /run || failed=1
+      if ! mountpoint /sys >/dev/null; then
+         mount -n /run || failed=1
+      fi
+
       mkdir -p /run/var /run/lock /run/shm
       chmod 1777 /run/shm
 
@@ -56,7 +59,7 @@ case "${1}" in
       # Copy devices that Udev >= 155 doesn't handle to /dev
       cp -a /lib/udev/devices/* /dev
 
-      ln -s /run/shm /dev/shm
+      ln -sfn /run/shm /dev/shm
       
       (exit ${failed})
       evaluate_retval
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b7ec3597b..b504ad4bb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,20 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-06-17</para>
+      <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Update rare issues in bootscripts when using LVM
+           or initramfs.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Add note about automake run time for tests. 
+           Fixes <ulink url="&lfs-ticket-root;3118">#3118</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-06-10</para>
       <itemizedlist>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 109da7059..53ea72496 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -49,12 +49,13 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
+    <note><para>The tests take a very long time: over 30 SBUs.  Running
+    the tests is not recommended.</para></note>
+
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>This takes a long time, about 10 SBUs.</para>
-
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 715db1d5f..e6fda46fd 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -82,8 +82,7 @@ rm man/man8/arpd.8</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">
-make DESTDIR=              \
+<screen><userinput remap="install">make DESTDIR=              \
      MANDIR=/usr/share/man \
      DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
 
diff --git a/general.ent b/general.ent
index d72bbd98b..083ffb20b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120610">
-<!ENTITY releasedate "June 10, 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 3e1872678..24c9b011e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -22,7 +22,7 @@
 <!ENTITY automake-md5 "036d79de6e443e02aec2be1df2b4f0ac">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "28.8 MB">
-<!ENTITY automake-ch6-sbu "18.3 SBU">
+<!ENTITY automake-ch6-sbu "less than 0.1 SBU (without tests)">
 
 <!ENTITY bash-version "4.2">
 <!ENTITY bash-size "6,845 KB">
@@ -302,7 +302,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20120530">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120617">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->