diff --git a/modules/aws/init.zsh b/modules/aws/init.zsh
new file mode 100755
index 00000000..0ae18dd5
--- /dev/null
+++ b/modules/aws/init.zsh
@@ -0,0 +1,31 @@
+_homebrew-installed() {
+  type brew &> /dev/null
+}
+
+_awscli-homebrew-installed() {
+  brew list awscli &> /dev/null
+}
+
+export AWS_HOME=~/.aws
+
+function agp {
+  echo $AWS_DEFAULT_PROFILE
+}
+function asp {
+  export AWS_DEFAULT_PROFILE=$1
+  export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>"
+}
+function aws_profiles {
+  reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/'))
+}
+
+compctl -K aws_profiles asp
+
+if _homebrew-installed && _awscli-homebrew-installed ; then
+  _aws_zsh_completer_path=$(brew --prefix)/opt/awscli/libexec/bin/aws_zsh_completer.sh
+else
+  _aws_zsh_completer_path=$(which aws_zsh_completer.sh)
+fi
+
+[ -x $_aws_zsh_completer_path ] && source $_aws_zsh_completer_path
+unset _aws_zsh_completer_path