diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index befc985b2..8217e2712 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-23  Matt Burgess <matthew@linuxfromscratch.org>
+
+   * lfs/init.d/mountvirtfs: Correct permissions on /run/shm
+
 2011-11-28  DJ Lucas <dj@linuxfromscratch.org>
 
    * lfs/init.d/mountfs: Add '-t nosysfs' to umount command
diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs
index be6c8d0a0..b8de10076 100644
--- a/bootscripts/lfs/init.d/mountvirtfs
+++ b/bootscripts/lfs/init.d/mountvirtfs
@@ -35,6 +35,7 @@ case "${1}" in
       mkdir -p /run
       mount -n /run || failed=1
       mkdir -p /run/{var,lock,shm}
+      chown 1777 /run/shm
 
       log_info_msg "Mounting virtual file systems: ${INFO}/run" 
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 009b17452..3f5750264 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-12-22</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Correct permissions on /run/shm. Fixes
+          <ulink url="&lfs-ticket-root;2984">#2984</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Add upstream patches for MPFR. Fixes
           <ulink url="&lfs-ticket-root;2983">#2983</ulink>.</para>
diff --git a/lsb-bootscripts/ChangeLog b/lsb-bootscripts/ChangeLog
index 769dcd581..02fffee96 100644
--- a/lsb-bootscripts/ChangeLog
+++ b/lsb-bootscripts/ChangeLog
@@ -1,3 +1,5 @@
+2011-12-23	Matt Burgess <matthew@linuxfromscratch.org>
+  * etc/init.d/mountvirtfs: Correct permissions on /run/shm
 2011-05-23	DJ Lucas <dj@linuxfromscratch.org>
   * Makefile, etc/default/rc: The value of ETCDIR is used to set the RC_BASE at
     install time. Changed default ETCDIR to /etc/rc.d and added /etc/init.d
diff --git a/lsb-bootscripts/etc/init.d/mountvirtfs b/lsb-bootscripts/etc/init.d/mountvirtfs
index 51f94a8b8..20fdd5a93 100644
--- a/lsb-bootscripts/etc/init.d/mountvirtfs
+++ b/lsb-bootscripts/etc/init.d/mountvirtfs
@@ -32,6 +32,7 @@ case "${1}" in
 
         # create needed directories in /run
         mkdir /run/{var,lock,shm} || failed=1
+        chown 1777 /run/shm
 
         (exit ${failed})
         evaluate_retval standard