diff --git a/completion.d/aws b/completion.d/aws
new file mode 100644
index 0000000..ada3810
--- /dev/null
+++ b/completion.d/aws
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if ( which aws && which aws_completer &> /dev/null )
+then
+  complete -C aws_completer aws
+fi
diff --git a/completion.d/kubectl b/completion.d/kubectl
new file mode 100644
index 0000000..f63ac1a
--- /dev/null
+++ b/completion.d/kubectl
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if ( which kubectl &> /dev/null )
+then
+  source <(kubectl completion bash)
+fi