diff --git a/directory.list b/directory.list
index 45af17f..57463d9 100644
--- a/directory.list
+++ b/directory.list
@@ -69,6 +69,7 @@
 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
@@ -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..1798a23 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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..035e732 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -183,6 +183,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
 
@@ -196,4 +200,11 @@ the home directories of system users.
 
 
 
+
+
+
+
+
+
+
 %changelog