diff --git a/home/.zshrc b/home/.zshrc
index 79d340f..475634c 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -27,11 +27,6 @@ if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
     plugins=($plugins virtualenvwrapper pip django fabric)
 fi
 
-# AWS CLI
-if [ -f /usr/local/bin/aws_zsh_completer.sh ]; then
-    plugins=($plugins aws)
-fi
-
 # Platform specific settings
 case "$OSTYPE" in 
     darwin*)
@@ -52,6 +47,11 @@ if [ -f "$HOME/.phpbrew/bashrc" ]; then
   source "$HOME/.phpbrew/bashrc"
 fi
 
+# AWS CLI
+if [ -f /usr/local/bin/aws_zsh_completer.sh ]; then
+    source /usr/local/bin/aws_zsh_completer.sh
+fi
+
 if [ $TERM = "screen" ]; then
   export DISABLE_AUTO_TITLE="true"
 fi