diff --git a/srcpkgs/base-directories/INSTALL b/srcpkgs/base-directories/INSTALL
index e9152734b7..aee7c346cd 100644
--- a/srcpkgs/base-directories/INSTALL
+++ b/srcpkgs/base-directories/INSTALL
@@ -47,11 +47,12 @@ make_system_dirs()
 			echo "/${d} must not be a directory, exiting!"
 			exit 1
 		fi
-		cd var && ln -sf ../${d} . && cd ..
 	done
+	cd var && ln -sf ../run . && cd ..
+	cd var && ln -sf ../run/lock . && cd ..
 
 	if [ "$(uname -m)" = "x86_64" ]; then
-		ln -sf lib lib64
+		ln -sf usr/lib lib64
 		cd usr && ln -sf lib lib64
 	fi
 
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index c3f8fd7042..90af547f3d 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.17
+version=0.18
 revision=1
 noarch=yes
 bootstrap=yes