diff --git a/plugins/aws/aws.plugin.sh b/plugins/aws/aws.plugin.sh
new file mode 100644
index 0000000..a74ed86
--- /dev/null
+++ b/plugins/aws/aws.plugin.sh
@@ -0,0 +1,20 @@
+# aws.plugin.sh
+# Author: Michael Anckaert <michael.anckaert@sinax.be>
+# Based on oh-my-zsh AWS plugin
+#
+# command 'agp' returns the selected AWS profile (aws get profile)
+# command 'asp' sets the AWS profile to use (aws set profile)
+#
+
+export AWS_HOME=~/.aws
+
+function agp {
+  echo $AWS_DEFAULT_PROFILE
+}
+
+function asp {
+  local rprompt=${RPROMPT/<aws:$(agp)>/}
+
+  export AWS_DEFAULT_PROFILE=$1
+  export AWS_PROFILE=$1
+}