diff --git a/directory.list b/directory.list
index 45af17f..6c8646e 100644
--- a/directory.list
+++ b/directory.list
@@ -69,8 +69,8 @@
 0700 root root /root/.gnupg
 0755 root root /root/bin
 0755 root root /run
+1775 root lock /run/lock
 0755 root root /sbin
-0755 root root /sbin/conf.d
 0755 root root /selinux
 0755 root root /srv/ftp
 0755 root root /srv/www
@@ -87,6 +87,7 @@
 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
@@ -175,8 +176,6 @@
 0755 nobody root /var/lib/nobody
 0700 root root /var/lib/pam_devperm
 0755 wwwrun root /var/lib/wwwrun
-1775 root lock /var/lock
-0755 root root /var/run
 0755 root root /var/spool
 0755 lp lp /var/spool/lpd
 0770 mail mail /var/spool/clientmqueue
diff --git a/filesystem.changes b/filesystem.changes
index a402c45..d4e5b35 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Oct 12 14:25:04 UTC 2012 - coolo@suse.com
+
+- own /usr/lib/tmpfiles.d
+
+-------------------------------------------------------------------
+Tue Sep 25 19:49:58 UTC 2012 - aj@suse.de
+
+- Remove also /sbin/conf.d/ (SuSEconfig directory).
+
+-------------------------------------------------------------------
+Tue Sep 25 12:30:57 UTC 2012 - fcrozat@suse.com
+
+- replace /var/run and /var/lock directories with symlinks to
+  /run and /run/lock (respectively).
+
 -------------------------------------------------------------------
 Thu Sep 20 13:46:26 CEST 2012 - kukuk@suse.de
 
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 a62e350..b5ad304 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -32,6 +32,10 @@ Source3:        ghost.list
 Source4:        languages.man
 Source64:       directory.list64
 
+%description
+This package installs the basic directory structure. It also includes
+the home directories of system users.
+
 %prep
 %setup -c -n filesystem -T
 
@@ -183,17 +187,11 @@ 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
 
-%description
-This package installs the basic directory structure. It also includes
-the home directories of system users.
-
-
-
-
-
-
-
 %changelog