diff --git a/env b/env
index 7202eab..68c51f6 100644
--- a/env
+++ b/env
@@ -44,6 +44,8 @@ if which virtualenvwrapper.sh 1>/dev/null 2>&1; then
     source `which virtualenvwrapper.sh`
 fi
 
+export GPG_TTY=`tty`
+
 # System specific settings
 if [[ -e "$HOME/.env.$SYS" ]]; then
     print_info -l 2 "Sourcing environment setup for $SYS systems"
diff --git a/rc b/rc
index 1fd058b..38a6dcf 100644
--- a/rc
+++ b/rc
@@ -14,6 +14,9 @@ alias v='vim'
 
 binary_exists ledger && alias l='ledger'
 
+binary_exists gpg2 && alias gpg='gpg2'
+binary_exists keybase && alias keybase="keybase -g \"`which gpg2`\""
+
 alias chux='chmod u+x'
 alias chuw='chmod u+w'
 alias chur='chmod u+r'