diff --git a/README.rst b/README.rst
index 6ead5b1..9ab5871 100644
--- a/README.rst
+++ b/README.rst
@@ -119,7 +119,7 @@ For now gcarrier and I have packaged autojump for Arch Linux. It is available in
 
  pacman -S autojump
 
-Tanguy Ortolo packaged autojump for Debian testing/unstable. It will eventually reach Ubuntu. To install, type::
+Autojump is now officially a part of Debian Sid, thanks to Tanguy Ortolo’s work (for policy reasons, it requires manual activation after installing, see /usr/share/doc/autojump/README.Debian). To install, type::
 
  apt-get install autojump
  
@@ -127,7 +127,7 @@ Autojump is also available on the OSX Homebrew package manager::
 
  brew install autojump
 
-I would be very interested by packages for other distros. If you think you can help me with the packaging, please contact me!
+Autojump is also packaged for a number of other distros. Check the wiki for an up-to-date list! I would be very interested by packages for other distros. If you think you can help with the packaging, please contact me!
 
 Uninstallation
 ==============
diff --git a/autojump b/autojump
index 31dd913..c5235b9 100755
--- a/autojump
+++ b/autojump
@@ -28,7 +28,7 @@ from operator import itemgetter
 import os
 import shutil
 
-AUTOJUMP_VERSION = "release v17"
+AUTOJUMP_VERSION = "release-v18"
 MAX_KEYWEIGHT = 1000
 MAX_STORED_PATHS = 600
 COMPLETION_SEPARATOR = '__'
diff --git a/autojump.bash b/autojump.bash
index 62e5c2f..41dcc2f 100644
--- a/autojump.bash
+++ b/autojump.bash
@@ -29,6 +29,26 @@ EOF
 }
 complete -F _autojump j
 
+_autojump_files() 
+{
+    if [[ ${COMP_WORDS[COMP_CWORD]} == *__* ]]
+    then
+        local cur
+        #cur=${COMP_WORDS[*]:1}
+        cur=${COMP_WORDS[COMP_CWORD]}
+        comps=$(autojump --bash --completion $cur)
+        while read i
+        do
+            #COMPREPLY=("${COMPREPLY[@]}" "${COMP_WORDS[@]:1:$(( ${#COMP_WORDS[@]} - 1 ))}${i}")
+            COMPREPLY=("${COMPREPLY[@]}" "${i}")
+        done <<EOF
+        $comps
+EOF
+    fi
+}
+complete -o default -o bashdefault -F _autojump_files cp
+complete -o default -o bashdefault -F _autojump_files mv
+
 #determine the data directory according to the XDG Base Directory Specification
 if [ -n "$XDG_DATA_HOME" ]
 then
diff --git a/git-version.sh b/git-version.sh
index 61fe82b..3f359e0 100755
--- a/git-version.sh
+++ b/git-version.sh
@@ -7,8 +7,14 @@ then
     exit
 fi
 
-gitrevision=`git describe`
-if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
-    gitrevision=$gitrevision"-dirty"
+if [ -z "$1" ]
+then
+    gitrevision=`git describe`
+    if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
+        gitrevision=$gitrevision"-dirty"
+    fi
+else
+    gitrevision="$1"
 fi
+
 sed -i "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"$gitrevision\"/" autojump
diff --git a/make_release.sh b/make_release.sh
index 3ff9ab0..1051c7b 100755
--- a/make_release.sh
+++ b/make_release.sh
@@ -8,9 +8,14 @@ then
   exit 1
 fi
 version=$1
+tagname=release-${version}
+./git-version.sh ${tagname}
+
+# Commit the version change
+git commit -m "version numbering" autojump
 
 #Create tag
-git tag -a release-${version}
+git tag -a ${tagname}
 
 #check for tag existence
 git describe release-$1 2>&1 >/dev/null ||
@@ -19,5 +24,4 @@ git describe release-$1 2>&1 >/dev/null ||
     exit 1
 }
 
-./git-version.sh
-git archive --format=tar --prefix autojump_${version}/ release-${version} | gzip > autojump_${version}.tar.gz
+git archive --format=tar --prefix autojump_${version}/ ${tagname} | gzip > autojump_${version}.tar.gz