diff --git a/srcpkgs/base-files/INSTALL b/srcpkgs/base-files/INSTALL
index afdb23d1e37..67552d56b40 100644
--- a/srcpkgs/base-files/INSTALL
+++ b/srcpkgs/base-files/INSTALL
@@ -64,7 +64,11 @@ make_system_dirs() {
 	cd var
 	ln -sf ../run .
 	ln -sf ../run/lock .
-	ln -sf spool/mail mail
+	ln -sfn spool/mail mail
+	if [ -L spool/mail/mail -a "$(readlink spool/mail/mail)" = spool/mail ]; then
+		# Get rid of broken symlink created by older versions of base-files.
+		rm spool/mail/mail
+	fi
 	cd ..
 
 	install -dm1777 tmp
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index dd0a421ffa9..7bd5c69333b 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.139
-revision=2
+revision=3
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"