diff --git a/bin/install_tool b/bin/install_tool
index 6e09593..e9cf302 100755
--- a/bin/install_tool
+++ b/bin/install_tool
@@ -86,6 +86,14 @@ case ${TOOL} in
       http://downloads.skullsecurity.org/passwords/hak5.txt.bz2
     bunzip2 ${DESTDIR}/hak5.txt.bz2
     ;;
+  gcloud)
+    gtemp=`mktemp -d`
+    gbase="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/"
+    gsdk="google-cloud-sdk-142.0.0-linux-x86_64.tar.gz"
+    wget -q -O /tmp/gcloud.tar.gz \
+      "${gbase}${gsdk}"
+    tar zxf /tmp/gcloud.tar.gz --strip-components=1 -C ${DESTDIR}
+    ;;
   *)
     echo "Unknown tool: ${TOOL}" >/dev/stderr
     exit 1
diff --git a/dotfiles/env b/dotfiles/env
index 0b62791..c1b83c7 100644
--- a/dotfiles/env
+++ b/dotfiles/env
@@ -4,18 +4,15 @@ umask 027
 ulimit -c unlimited
 
 # Paths and preferences
-export PATH="$HOME/bin:/sbin:/usr/sbin:$PATH"
 export PYTHONPATH="$HOME/.python:$PYTHONPATH"
 export GOPATH="$HOME/Projects/Go"
+export PATH="$HOME/bin:/sbin:/usr/sbin:$PATH:$GOPATH/bin"
 export VISUAL=vim
 export EDITOR=vim
 export DEBEMAIL="david@systemoverlord.com"
 export DEBFULLNAME="David Tomaschik"
 export LESS="-MR"
 
-# Unconditional because /bin/sh sucks
-export PATH="$PATH:$HOME/.gce/google-cloud-sdk/bin:$HOME/bin/genymotion:$HOME/bin/genymotion/tools:$HOME/bin/google_appengine:$HOME/bin/go_appengine:$HOME/bin/google-cloud-sdk/bin:$GOPATH/bin"
-
 # Fix gnome-terminal
 if [[ $TERM == "xterm" && $COLORTERM == "gnome-terminal" ]] ; then
   export TERM="xterm-256color"
diff --git a/dotfiles/zsh_custom/plugins/gcloud/gcloud.plugin.zsh b/dotfiles/zsh_custom/plugins/gcloud/gcloud.plugin.zsh
new file mode 100755
index 0000000..3cfb6a7
--- /dev/null
+++ b/dotfiles/zsh_custom/plugins/gcloud/gcloud.plugin.zsh
@@ -0,0 +1,13 @@
+#!/bin/zsh
+
+GCL=${HOME}/tools/gcloud
+
+if [ ! -d ${GCL} ] ; then
+  return
+fi
+
+# Add bin to path
+export PATH="${PATH}:${GCL}/bin"
+
+# Load completion
+source ${GCL}/completion.zsh.inc
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 58c7d1c..c25e79b 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -29,7 +29,7 @@ if [ -d $HOME/.oh-my-zsh ] ; then
   ZSH=$HOME/.oh-my-zsh
   ZSH_THEME="matir"
   ZSH_CUSTOM="$HOME/.zsh_custom"
-  plugins=(git encode64 gpg-agent pep8 pip python tmux urltools extract sudo virsh virtualenv jekyll metasploit)
+  plugins=(git encode64 gpg-agent pep8 pip python tmux urltools extract sudo virsh virtualenv jekyll metasploit gcloud)
   test -f /usr/share/virtualenvwrapper/virtualenvwrapper.sh && plugins+=(virtualenvwrapper)
   source $ZSH/oh-my-zsh.sh
   unset ZSH_THEME