diff --git a/.bash_aliases.MKAYSIGREP b/.bash_aliases.MKAYSIGREP
index 571b9ea5..5c769ba5 100644
--- a/.bash_aliases.MKAYSIGREP
+++ b/.bash_aliases.MKAYSIGREP
@@ -1,3 +1,2 @@
 alias top="htop" # MKAYSIGREP # MKAYSIGREPALIAS
 alias gitk="gitg" # Requires gitg . I just think that it looks nicer than gitk. #MKAYSIGREP # MKAYSIGREPALIAS
-alias gpg=gpg2 # MKAYSIGREP # MKAYSIGREPALIAS
diff --git a/.zsh_aliases.MKAYSIGREP b/.zsh_aliases.MKAYSIGREP
index cfedb632..d621e0ce 100644
--- a/.zsh_aliases.MKAYSIGREP
+++ b/.zsh_aliases.MKAYSIGREP
@@ -1,5 +1,2 @@
 alias top="htop" # MKAYSIGREP MKAYSIGREPALIAS
 alias gitk="gitg" # Requires gitg . I just think that it looks nicer than gitk. # MKAYSIGREP MKAYSIGREPALIAS
-alias gpg=gpg2 # MKAYSIGREP MKAYSIGREPALIAS
-compdef gpg2=gpg # MKAYSIGREP MKAYSIGREPALIAS
-
diff --git a/bashrc b/bashrc
index 7da802f2..f3477173 100644
--- a/bashrc
+++ b/bashrc
@@ -367,7 +367,8 @@ if [[ $UNAME != Darwin ]]; then
 fi
 
 # Use GPG2 instead of GPG!
-# alias gpg=gpg2 # MKAYSIGREP # MKAYSIGREPALIAS
+alias gpg=gpg2
+export KEYBASE_GPG=gpg2
 alias gpg-fix-tty='export GPG_TTY=$(tty)'
 
 # For userspecific installation of mosh on remote server.
diff --git a/zshrc b/zshrc
index 9dd7b7b4..3d8315f9 100644
--- a/zshrc
+++ b/zshrc
@@ -326,7 +326,9 @@ if [[ $UNAME != Darwin ]]; then
 fi
 
 # Use GPG2 instead of GPG!
-#alias gpg=gpg2 # MKAYSIGREP MKAYSIGREPALIAS
+alias gpg=gpg2
+compdef gpg2=gpg
+export KEYBASE_GPG=gpg2
 alias gpg-fix-tty='export GPG_TTY=$(tty)'
 
 # ZSH doesn't currently include automatic completion for GPG2,