diff --git a/srcpkgs/base-directories/INSTALL b/srcpkgs/base-directories/INSTALL
index 5aafc9019e..2423600a7e 100644
--- a/srcpkgs/base-directories/INSTALL
+++ b/srcpkgs/base-directories/INSTALL
@@ -1,14 +1,14 @@
 case "${ACTION}" in
 post)
 	# Create compat symlinks for /run.
+	for d in tmp var/tmp var/run var/lock lib/rc/init.d; do
+		[ -d "$d" ] && rmdir "$d"
+		[ -h "$d" ] && rm -f "$d"
+	done
         ln -sf /run/init.d lib/rc/init.d
-        [ -d tmp ] && rmdir tmp
         ln -sf /run/tmp tmp
-        [ -d var/tmp ] && rmdir var/tmp
         ln -sf /run/tmp var/tmp
-        [ -d var/run ] && rmdir var/run
-        ln -sf /run/pid var/run
-        [ -d var/lock ] && rmdir var/lock
+        ln -sf /run var/run
         ln -sf /run/lock var/lock
 	;;
 esac
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index c1d3ebcab6..d504f1f58c 100644
--- a/srcpkgs/base-directories/template
+++ b/srcpkgs/base-directories/template
@@ -1,6 +1,6 @@
 # Template file for 'base-directories'
 pkgname=base-directories
-version=0.5
+version=0.6
 build_style=custom-install
 short_desc="XBPS FHS Base System directories"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -57,7 +57,7 @@ do_install()
 
 	install -d ${DESTDIR}/lib/rc
 
-	for d in init.d pid udev; do
+	for d in init.d udev; do
 		install -d -m0755 ${DESTDIR}/run/${d}
 	done
 	for d in lock tmp shm; do