diff --git a/debian/changelog b/debian/changelog
index db40d24..0b874bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+editline (1.12-6) unstable; urgency=low
+
+  * Switch package format to 3.0 (quilt).
+  * 200_fix-truncation-at-64-char.diff: fix invalid 64-char truncation in
+    batch mode, courtesy of Mark O'Donohue. Thanks to Damyan Ivanov for
+    forwarding the patch from Ubuntu (Closes: #508640).
+
+ -- Sam Hocevar <sho@debian.org>  Sun, 03 Jan 2010 15:45:34 +0100
+
 editline (1.12-5) unstable; urgency=low
 
   * New maintainer (Closes: #229962).
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 9409983..73b7281 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: editline
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 4.0), libtool
-Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 5.0), libtool
+Maintainer: Sam Hocevar <sho@debian.org>
+Standards-Version: 3.8.3
 
 Package: libeditline-dev
 Architecture: any
 Section: libdevel
-Depends: libeditline0 (= ${Source-Version})
+Depends: libeditline0 (= ${binary:Version}), ${misc:Depends}
 Description: development files for libeditline
  This is a line-editing library. It can be linked into almost any program
  to provide command-line editing and recall. It is call-compatible with a
@@ -21,7 +21,7 @@ Description: development files for libeditline
 Package: libeditline0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: line editing library similar to readline
  This is a line-editing library. It can be linked into almost any program
  to provide command-line editing and recall. It is call-compatible with a
diff --git a/debian/rules b/debian/rules
index 3ee10bc..2b07c52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	dh_clean
 
 install: build
@@ -34,21 +34,18 @@ install: build
 binary-indep: build install
 
 binary-arch: build install
-#	dh_testversion
 	dh_testdir
 	dh_testroot
-
-        # build libeditline${major} package by moving files from editline-dev
+	# build libeditline${major} package by moving files from editline-dev
 	dh_movefiles --sourcedir=debian/libeditline-dev \
 	             -plibeditline$(major) \
 	             usr/lib/libeditline.so.$(major) \
 	             usr/lib/libeditline.so.$(version)
-
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
 	dh_installmanpages
-	rm -r debian/libeditline0/usr/share/man/
+	rm -rf debian/libeditline0/usr/share/man/
 	dh_installcron
 	dh_installinfo
 	dh_installchangelogs