diff --git a/srcpkgs/base-files/files/xdg-user-dirs.sh b/srcpkgs/base-files/files/xdg-user-dirs.sh
new file mode 100644
index 00000000000..67ed0804d58
--- /dev/null
+++ b/srcpkgs/base-files/files/xdg-user-dirs.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+CFGDIR=$HOME/.config
+
+if [ -f "/usr/bin/xdg-user-dirs-update" ] && [ -f "/usr/bin/xdg-user-dirs-gtk-update" ]; then
+	if [ ! -f "$CFGDIR/user-dirs.dirs" ] && [ ! -f "$CFGDIR/user-dirs.locale" ]; then
+		xdg-user-dirs-update
+		xdg-user-dirs-gtk-update
+		echo "XDG user dirs created/updated."
+	fi
+fi
+
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 4e3e282d440..6e2f234c88a 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.86
-revision=1
+revision=2
 bootstrap=yes
 makedepends="base-directories xbps-triggers"
 short_desc="Void Linux base system files"
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 4d829a3720c..98a858c5924 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
 version=1.16.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-hal --disable-afc
  --with-bash-completion-dir=/usr/share/bash-completion/completions"
@@ -19,6 +19,10 @@ license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/1.16/$pkgname-$version.tar.xz"
 checksum=6b0e62d27fe73844efb536689057b762fbce085984800c83395371306ec547f1
 
+post_install() {
+	cd ${DESTDIR}/usr/bin && ln -sf gvfs-open gnome-open
+}
+
 gvfs-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {