diff --git a/completion/available/makefile.completion.bash b/completion/available/makefile.completion.bash
new file mode 100644
index 00000000..c2a833ac
--- /dev/null
+++ b/completion/available/makefile.completion.bash
@@ -0,0 +1,3 @@
+# Add completion for Makefile
+# see http://stackoverflow.com/a/38415982/1472048
+complete -W "\`grep -oE '^[a-zA-Z0-9_-]+:([^=]|$)' Makefile | sed 's/[^a-zA-Z0-9_-]*$//'\`" make