diff --git a/.gitignore b/.gitignore
index 578793a..cea904e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.cache
 sublime/User/Package Control.last-run
 sublime/User/Package Control.system-ca-bundle
+bash_completion.d
diff --git a/bash_completion.d/.gitkeep b/bash_completion.d/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/includes/bash_completion.bash b/includes/bash_completion.bash
index 2dfe374..d79dc2f 100644
--- a/includes/bash_completion.bash
+++ b/includes/bash_completion.bash
@@ -16,3 +16,11 @@ complete -F _tmux t
 
 # Add Gush completion.
 [ -f $HOME/.gush/.gush-autocomplete.bash ] && source $HOME/.gush/.gush-autocomplete.bash
+
+if [ -d $HOME/dotfiles/bash_completion.d ];
+then
+    for file in `find $HOME/dotfiles/bash_completion.d/ -type f -name '*.sh'`
+    do
+        source $file
+    done
+fi