diff --git a/srcpkgs/kbfs/INSTALL b/srcpkgs/kbfs/INSTALL
new file mode 100644
index 00000000000..5804220dd40
--- /dev/null
+++ b/srcpkgs/kbfs/INSTALL
@@ -0,0 +1,11 @@
+ROOTMOUNT="/keybase"
+
+case "${ACTION}" in
+post)
+	if ! mountpoint "$ROOTMOUNT" > /dev/null; then
+		mkdir -p "$ROOTMOUNT"
+		chown root:root "$ROOTMOUNT"
+		chmod 755 "$ROOTMOUNT"
+	fi
+	;;
+esac
diff --git a/srcpkgs/kbfs/template b/srcpkgs/kbfs/template
index ea60e5ce22d..5b1b216428c 100644
--- a/srcpkgs/kbfs/template
+++ b/srcpkgs/kbfs/template
@@ -1,12 +1,12 @@
 # Template file for 'kbfs'.
 pkgname=kbfs
 version=2.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/keybase/kbfs"
-go_package="${go_import_path}/kbfsfuse ${go_import_path}/kbfsgit/git-remote-keybase ${go_import_path}/kbfstool"
+go_package="${go_import_path}/kbfsfuse ${go_import_path}/kbfsgit/git-remote-keybase ${go_import_path}/kbfstool ${go_import_path}/redirector"
 go_build_tags="production"
-depends="keybase"
+depends="keybase util-linux"
 short_desc="Keybase Filesystem"
 maintainer="Toyam Cox <Vaelatern@voidlinux.eu>"
 license="BSD-3-Clause"
@@ -15,5 +15,9 @@ distfiles="https://github.com/keybase/kbfs/archive/v${version}.tar.gz"
 checksum=0f9f785dfa95f4b93a24d18dff4d6a0a8e637139873370eb3f2a8c8d67505dd4
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/redirector ${DESTDIR}/usr/bin/keybase-redirector
+	# setuid
+	chmod 4755 ${DESTDIR}/usr/bin/keybase-redirector
+
 	vlicense LICENSE
 }