diff -up monotone-1.0/test/extra/bash_completion/bashrc.orig monotone-1.0/test/extra/bash_completion/bashrc
--- monotone-1.0/test/extra/bash_completion/bashrc.orig	2011-03-26 07:41:02.000000000 +0100
+++ monotone-1.0/test/extra/bash_completion/bashrc	2013-03-09 18:44:36.811369952 +0100
@@ -18,6 +18,8 @@ if [ "$BASH_COMPLETION" = "" ]; then
 	. /etc/bash_completion
     elif [ -f /usr/local/etc/bash_completion ]; then
 	. /usr/local/etc/bash_completion
+    elif [ -f /usr/share/bash-completion/bash_completion ] ; then
+	. /usr/share/bash-completion/bash_completion
     else
 	echo No bash completion package present.
 	exit
diff -up monotone-1.0/test/extra/bash_completion/library.exp.orig monotone-1.0/test/extra/bash_completion/library.exp
--- monotone-1.0/test/extra/bash_completion/library.exp.orig	2011-03-26 07:41:02.000000000 +0100
+++ monotone-1.0/test/extra/bash_completion/library.exp	2013-03-09 18:42:07.087240069 +0100
@@ -16,7 +16,7 @@ set timeout 2
 set env(initial_dir) $initial_dir
 set env(srcdir) $srcdir
 # some user's ~/.bash_profile start xserver etc; don't do that
-spawn "bash" "--init-file" "/dev/nul" "--rcfile" "$srcdir/extra/bash_completion/bashrc"
+spawn "bash" "--init-file" "/dev/null" "--rcfile" "$srcdir/extra/bash_completion/bashrc"
 # If there is no completion package, it's no point trying this.
 # Make sure we do get a prompt.
 expect {