diff --git a/eb_bash_completion.bash b/eb_bash_completion.bash
new file mode 100644
index 0000000000..1ce56f67c0
--- /dev/null
+++ b/eb_bash_completion.bash
@@ -0,0 +1,13 @@
+_eb()
+{
+    local cur prev quoted
+    _get_comp_words_by_ref cur prev
+    _quote_readline_by_ref "$cur" quoted
+
+	case $cur in 
+		--*) _optcomplete "$@"; return 0 ;;
+		*)  COMPREPLY=( $(compgen -f -X '!*.eb' -- $cur ) \
+                        $(compgen -W "$($1 --search-file ${cur:-eb} --terse)" -- $cur) ) ;;
+	esac
+}
+complete -F _eb eb
diff --git a/setup.py b/setup.py
index 6e5cd1e109..8abb0ac5d0 100644
--- a/setup.py
+++ b/setup.py
@@ -91,7 +91,7 @@ def find_rel_test():
     packages=easybuild_packages,
     package_dir={'test.framework': "test/framework"},
     package_data={"test.framework": find_rel_test()},
-    scripts=["eb", "optcomplete.bash", "minimal_bash_completion.bash"],
+    scripts=["eb", "optcomplete.bash", "minimal_bash_completion.bash", "eb_bash_completion.bash"],
     data_files=[('easybuild/scripts', glob.glob('easybuild/scripts/*'))],
     long_description=read('README.rst'),
     classifiers=[