diff --git a/Makefile b/Makefile
index 119c1eeaa..c97d6ffb0 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,8 @@ README.txt: README.md
 youtube-dl.1: README.md
 	pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md devscripts/bash_completion.template
-	python devscripts/bash_completion.py
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.template
+	python devscripts/bash-completion.py
 
 youtube-dl.tar.gz: all
 	tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
diff --git a/devscripts/bash_completion.py b/devscripts/bash-completion.py
similarity index 85%
rename from devscripts/bash_completion.py
rename to devscripts/bash-completion.py
index 704034f22..880db7886 100644
--- a/devscripts/bash_completion.py
+++ b/devscripts/bash-completion.py
@@ -6,8 +6,8 @@ import sys
 sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
 
-BASH_COMPLETION_FILE = "youtube-dl.bash_completion"
-BASH_COMPLETION_TEMPLATE = "devscripts/bash_completion.template"
+BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
+BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.template"
 
 def build_completion(opt_parser):
     opts_flag = []
diff --git a/devscripts/bash_completion.template b/devscripts/bash-completion.template
similarity index 100%
rename from devscripts/bash_completion.template
rename to devscripts/bash-completion.template