diff --git a/srcpkgs/base-files/INSTALL b/srcpkgs/base-files/INSTALL
index b4286d485d5..83a9c7cbe63 100644
--- a/srcpkgs/base-files/INSTALL
+++ b/srcpkgs/base-files/INSTALL
@@ -1,5 +1,5 @@
 case "${ACTION}" in
 post)
-	ln -sf /proc/self/mounts etc/mtab
+	[ ! -h etc/mtab ] && ln -sf /proc/self/mounts etc/mtab
 	;;
 esac
diff --git a/srcpkgs/base-files/files/locale.sh b/srcpkgs/base-files/files/locale.sh
new file mode 100644
index 00000000000..8486367bfab
--- /dev/null
+++ b/srcpkgs/base-files/files/locale.sh
@@ -0,0 +1,9 @@
+# Sets up locale system settings from /etc/locale.conf.
+#
+if [ -s /etc/locale.conf ]; then
+	. /etc/locale.conf
+fi
+
+export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY
+export LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
+export LC_INDENTIFICATION
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 0a19fc59084..677e3e5e94e 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.54
+version=0.55
 short_desc="Void GNU/Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"