diff --git a/directory.list b/directory.list
index 5905776..d86e169 100644
--- a/directory.list
+++ b/directory.list
@@ -87,7 +87,6 @@
 0755 root root /usr/include
 0755 root root /usr/include/X11
 0755 root root /usr/lib
-0755 root root /usr/lib/tmpfiles.d
 0755 root root /usr/lib/X11
 0755 root root /usr/lib/lsb
 0755 root root /usr/lib/news
@@ -187,5 +186,3 @@
 0755 root root /var/opt
 0700 root root /var/adm/update-scripts
 0700 root root /var/adm/update-messages
-1775 root lock /var/lock
-0755 root root /var/run
diff --git a/filesystem.changes b/filesystem.changes
index d4e5b35..0af9943 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Oct 20 09:03:48 UTC 2012 - coolo@suse.com
+
+- remove get_version_number.sh, it's unused since ages
+
+-------------------------------------------------------------------
+
+Mon Oct 15 10:47:36 UTC 2012 - aj@suse.de
+
+- Revert last change since aaa_base removed /usr/lib/tmpfiles.d.
+
 -------------------------------------------------------------------
 Fri Oct 12 14:25:04 UTC 2012 - coolo@suse.com
 
diff --git a/filesystem.links b/filesystem.links
index 9e40c7f..da72da8 100644
--- a/filesystem.links
+++ b/filesystem.links
@@ -1,4 +1,6 @@
 # links to be created
+../run			/var/run
+../run/lock		/var/lock
 init.d			/etc/rc.d
 ../var/tmp		/usr/tmp
 ../lock			/var/spool/locks
diff --git a/filesystem.spec b/filesystem.spec
index 8575289..b14c078 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -167,7 +167,7 @@ NON_EXISTING_DIR=
 for FILE in `rpm -ql aaa_base` ; do
     test -d $FILE && continue
     case $FILE in
-      /sbin/init.d*|/usr/share/doc/support/*|/lib/mkinitrd/scripts/*|/lib/udev/devices/*)
+      /sbin/init.d*|/usr/share/doc/support/*|/lib/mkinitrd/scripts/*)
              continue
              ;;
       /usr/share/doc/packages/aaa_base/*|/lib/aaa_base/*)
@@ -187,6 +187,10 @@ test -n "$NON_EXISTING_DIR" && {
 %pre -p <lua>
 os.remove ("/usr/include/X11")
 os.remove ("/usr/lib/X11")
+os.execute ("mountpoint -q /var/lock && umount -l /var/lock")
+os.rename ("/var/lock","/var/lock.migrated")
+os.execute ("mountpoint -q /var/run && umount -l /var/run")
+os.rename ("/var/run","/var/run.migrated")
 
 %files -f filesystem.list
 
diff --git a/get_version_number.sh b/get_version_number.sh
deleted file mode 100644
index 30a2aa1..0000000
--- a/get_version_number.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-echo ${BUILD_DISTRIBUTION_VERSION%-*}
-