diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
index 09bc800..e479205 100644
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,20 +1,27 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-
-# Original: volatiles = "cache run log lock tmp"
-# We don't any of those in volatiles, so:
-volatiles = ""
-dirs755 += "${localstatedir}/cache \
-            ${localstatedir}/log \
-            ${localstatedir}/lock \
-            ${localstatedir}/lock/subsys \
-            ${localstatedir}/tmp \
-            ${localstatedir}/volatile/tmp \
-            /run \
-           "
-
 BASEFILESISSUEINSTALL = "do_install_angstromissue"
 
+# In previous versions of base-files, /run was a softlink to /var/run and the
+# directory was located in /var/volatlie/run.  Also, /var/lock was a softlink
+# to /var/volatile/lock which is where the real directory was located.  Now,
+# /run and /run/lock are the real directories.  If we are upgrading, we may
+# need to remove the symbolic links first before we create the directories.
+# Otherwise the directory creation will fail and we will have circular symbolic
+# links.
+# 
+pkg_preinst_${PN} () {
+    #!/bin/sh -e
+    if [ x"$D" = "x" ]; then
+        rm -rf /var/lock
+
+        if [ -h "/run" ]; then
+            # Remove the symbolic link
+            rm -f /run
+        fi
+    fi     
+}
+
 do_install_angstromissue () {
     echo ${MACHINE} > ${D}${sysconfdir}/hostname