diff --git a/makefile b/makefile
index ca074e6..5bd7b95 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@
 PIPMODULES = ansible pew pythonz-bd
 
 # Set of packages we want to include in the distribution tarball
-MYTOOLS = emacs file-formula git htop joe nmap screen socat the_silver_searcher tmux tree vim
+MYTOOLS = bash-completion emacs file-formula git htop joe nmap screen socat the_silver_searcher tmux tree vim
 
 
 # ----------- Nothing below here should need changing ----------- #
@@ -46,6 +46,7 @@
 bootstrap-release: tidyup
 	cd ${INSTALLDIR} && mv -v ${TOOLS} ${TOOLS}-bootstrap-${DATESTAMP}
 	cd ${INSTALLDIR} && tar -czvf ${EXPORTDIR}/${TOOLS}-bootstrap-${DATESTAMP}.tar.gz ${TOOLS}-bootstrap-${DATESTAMP}
+	cd ${INSTALLDIR} && mv -v ${TOOLS}-bootstrap-${DATESTAMP} ${TOOLS}
 
 
 # Full tools set
@@ -62,6 +63,7 @@
 full-release: tidyup
 	cd ${INSTALLDIR} && mv -v ${TOOLS} ${TOOLS}-${DATESTAMP}
 	cd ${INSTALLDIR} && tar -czvf ${EXPORTDIR}/${TOOLS}-${DATESTAMP}.tar.gz ${TOOLS}-${DATESTAMP}
+	cd ${INSTALLDIR} && mv -v ${TOOLS}-${DATESTAMP} ${TOOLS}
 
 
 # Special cases and dependencies can go here