diff --git a/debian/changelog b/debian/changelog
index 01d8379..2087378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ubuntu-dev-tools (0.59) UNRELEASED; urgency=low
 
-  * Changes go here.
+  * Move /etc/bash_completion.d/pbuilder-dist/pbuilder-dist created in
+    pre-0.30 versions to /etc/bash_completion.d/pbuilder-dist in the preinst.
 
- -- Jonathan Davies <jpds@ubuntu.com>  Mon, 19 Jan 2009 16:52:03 +0000
+ -- Loic Minier <lool@dooz.org>  Mon, 19 Jan 2009 18:02:55 +0100
 
 ubuntu-dev-tools (0.58) jaunty; urgency=low
 
diff --git a/debian/ubuntu-dev-tools.preinst b/debian/ubuntu-dev-tools.preinst
new file mode 100644
index 0000000..a41d6c2
--- /dev/null
+++ b/debian/ubuntu-dev-tools.preinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+if [ -e /etc/bash_completion.d/pbuilder-dist/pbuilder-dist ]; then
+    tmp_file="$(mktemp /etc/bash_completion.d/pbuilder-dist.XXXXXX)"
+    mv -fv /etc/bash_completion.d/pbuilder-dist/pbuilder-dist \
+        "$tmp_file"
+    rmdir --ignore-fail-on-non-empty /etc/bash_completion.d/pbuilder-dist
+    # dir non-empty
+    if [ -d /etc/bash_completion.d/pbuilder-dist ]; then
+        echo "W: /etc/bash_completion.d/pbuilder-dist not empty; moving /etc/bash_completion.d/pbuilder-dist out of the way"
+        mv -fv /etc/bash_completion.d/pbuilder-dist /etc/bash_completion.d/pbuilder-dist.dpkg-disabled
+
+    fi
+    mv -fv "$tmp_file" /etc/bash_completion.d/pbuilder-dist
+fi
+
+#DEBHELPER#
+