diff --git a/filesystem.spec b/filesystem.spec
index d9485a0..520f71b 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:          filesystem
 Version:       2.2
-Release:       18mamba
+Release:       19mamba
 Summary:       The basic directory layout for a Linux system
 Group:         System/Configuration
 Vendor:        openmamba
@@ -39,8 +39,8 @@ install -d %{buildroot}/usr/local/games
 #ln -s ../share/man %{buildroot}/usr/local/man
 install -d %{buildroot}/usr/local/man
 
-install -d %{buildroot}/var/{lock,log,mail,run,spool}
-install -d %{buildroot}/var/{tmp,opt,cache,%_lib/misc,local}
+install -d %{buildroot}/var/{lock,log,mail,spool}
+install -d %{buildroot}/var/{tmp,opt,cache,lib/misc,local}
 install -d %{buildroot}/opt/{bin,doc,include,info}
 install -d %{buildroot}/opt/{%_lib,man/man{1,2,3,4,5,6,7,8}}
 install -d %{buildroot}/var/lock/subsys
@@ -52,6 +52,7 @@ install -d %{buildroot}/sys
 
 ln -s ../var/tmp %{buildroot}/usr
 ln -s ../mail %{buildroot}/var/spool/mail
+ln -s ../run %{buildroot}/var/run
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -61,6 +62,16 @@ ln -s ../mail %{buildroot}/var/spool/mail
 #%pre
 #[ -L /usr/local/man ] && rm -f /usr/local/man || :
 
+%pre
+[ -L /var/run ] || {
+   mv /var/run /var/run.rpmold
+   for f in /var/run.rpmold/*; do
+      b=`basename $f`
+      [ -e /run/$b ] || mv $f /run/
+   done
+}
+:
+
 %files
 %defattr(-,root,root)
 %attr(0755,root,root) %dir /
@@ -125,8 +136,10 @@ ln -s ../mail %{buildroot}/var/spool/mail
 
 %dir /var
 %dir /var/cache
-%dir /var/%_lib/misc
+%dir /var/lib
+%dir /var/lib/misc
 %dir /var/local
+%dir /var/lock
 %attr(0755,root,root) /var/lock/subsys
 %dir /var/log
 %dir /var/mail
@@ -142,11 +155,15 @@ ln -s ../mail %{buildroot}/var/spool/mail
 %dir /opt/include
 %dir /opt/info
 %dir /opt/%_lib
+%dir /opt/man
 /opt/man/man*
 
 /usr/tmp
 
 %changelog
+* Sun Mar 17 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2-19mamba
+- migrate /var/run to a symlink of /run
+
 * Tue Dec 11 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2-18mamba
 - own root dir with 0755 permissions