diff --git a/srcpkgs/base-directories/INSTALL b/srcpkgs/base-directories/INSTALL
index ffdb2cd1f46..849cbe5edfc 100644
--- a/srcpkgs/base-directories/INSTALL
+++ b/srcpkgs/base-directories/INSTALL
@@ -43,10 +43,14 @@ make_system_dirs()
 	[ ! -d lib/rc ] && install -d lib/rc
 
 	for d in init.d udev; do
-		[ ! -d run/${d} ] && install -dm0755 run/${d}
+		if [ ! -d run/${d} -a ! -h run/${d} ]; then
+			install -dm0755 run/${d}
+		fi
 	done
 	for d in lock tmp shm; do
-		[ ! -d run/${d} ] && install -dm1777 run/${d}
+		if [ ! -d run/${d} -a ! -h run/${d} ]; then
+			install -dm1777 run/${d}
+		fi
 	done
 }
 
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index cf6e6e43034..ae66ecf9f7b 100644
--- a/srcpkgs/base-directories/template
+++ b/srcpkgs/base-directories/template
@@ -1,9 +1,11 @@
 # Template file for 'base-directories'
 pkgname=base-directories
-version=0.12
+version=0.13
 build_style=custom-install
 short_desc="Vanilla GNU/Linux base system directories"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="https://vanilla.github.com"
+license="Public domain"
 long_desc="
  This package installs the base system directories as specifed by FHS that aren't
  installed by any other package and are required on any GNU/Linux system."