diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh
index d7d70bf21..76ca6bc14 100644
--- a/packages/keybase/build.sh
+++ b/packages/keybase/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://keybase.io
 TERMUX_PKG_DESCRIPTION="Key directory that maps social media identities to encryption keys"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_VERSION=4.0.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=503e068e7e89a57c497e40cee5b161704c23919bc59846a6507dfc5ecd418091
 TERMUX_PKG_SRCURL=https://github.com/keybase/client/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_REPLACES="kbfs"
@@ -24,17 +24,4 @@ termux_step_make_install() {
 	cp keybase $TERMUX_PREFIX/bin/keybase
 	cp git-remote-keybase $TERMUX_PREFIX/bin/git-remote-keybase
 	cp kbfsfusebin $TERMUX_PREFIX/bin/kbfsfuse
-
-	mkdir -p $TERMUX_PREFIX/etc/profile.d/
-	echo "export KEYBASE_SECRET_STORE_FILE=1" > $TERMUX_PREFIX/etc/profile.d/keybase.sh
-}
-
-termux_step_create_debscripts() {
-    {
-	echo "#!$TERMUX_PREFIX/bin/sh"
-	echo "echo Before using keybase restart the termux session. Otherwise,"
-	echo "echo keybase will throw an error about a not functional secret store"
-	echo "exit 0"
-    } > postinst
-    chmod 0755 postinst
 }
diff --git a/packages/keybase/go-libkb-env.go.patch b/packages/keybase/go-libkb-env.go.patch
new file mode 100644
index 000000000..ef2da3a81
--- /dev/null
+++ b/packages/keybase/go-libkb-env.go.patch
@@ -0,0 +1,12 @@
+diff -u -r ../client-4.0.0/go/libkb/env.go ./go/libkb/env.go
+--- ../client-4.0.0/go/libkb/env.go	2019-05-07 19:35:07.000000000 +0000
++++ ./go/libkb/env.go	2019-05-11 22:36:35.015703478 +0000
+@@ -1784,7 +1784,7 @@
+ func (e *Env) ForceSecretStoreFile() bool {
+ 	// By default use system-provided secret store (like MacOS Keychain), but
+ 	// allow users to fall back to file-based store for testing and debugging.
+-	return e.GetBool(false,
++	return e.GetBool(true,
+ 		func() (bool, bool) { return e.getEnvBool("KEYBASE_SECRET_STORE_FILE") },
+ 		func() (bool, bool) { return e.GetConfig().GetForceSecretStoreFile() },
+ 	)