diff --git a/srcpkgs/base-files/INSTALL b/srcpkgs/base-files/INSTALL
index 3bd7a29ac71..302691360f1 100644
--- a/srcpkgs/base-files/INSTALL
+++ b/srcpkgs/base-files/INSTALL
@@ -47,19 +47,19 @@ make_system_dirs() {
 		[ ! -d var/${d} ] && install -d var/${d}
 	done
 
-	if [ "${ARCH}" = "x86_64" ]; then
-		ln -sf usr/lib lib64
-		cd usr && ln -sf lib lib64 && cd ..
-		install -d usr/lib32
-		ln -sf usr/lib32 lib32
+	if [ "${ARCH}" = "x86_64" ] || [ "${ARCH}" = "ppc64le" ]; then
+		[ -L lib64 ] || ln -sf usr/lib lib64
+		cd usr
+		[ -L lib64 ] || ln -sf lib lib64
+		cd ..
 	fi
-	if [ "${ARCH}" = "ppc64le" ]; then
-		ln -sf usr/lib lib64
-		cd usr && ln -sf lib lib64 && cd ..
+	if [ "${ARCH}" = "x86_64" ]; then
+		install -d usr/lib32
+		[ -L lib32 ] || ln -sf usr/lib32 lib32
 	fi
 	if [ "${ARCH}" = "i686" ]; then
-		ln -sf lib lib32
-		ln -sf lib usr/lib32
+		[ -L lib32 ] || ln -sf lib lib32
+		[ -L usr/lib32 ] || ln -sf lib usr/lib32
 	fi
 
 	# Create /var/run and /var/lock symlinks.
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index a2a7de6be18..9b9fcec8395 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,13 +1,13 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.140
-revision=1
+revision=2
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-homepage="https://www.voidlinux.eu"
 license="Public domain"
+homepage="https://www.voidlinux.org"
 conf_files="
 	/etc/inputrc
 	/etc/profile