diff -Nru lksctp-tools-1.0.11+dfsg/debian/changelog lksctp-tools-1.0.11+dfsg/debian/changelog
--- lksctp-tools-1.0.11+dfsg/debian/changelog	2011-04-30 22:13:45.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/changelog	2011-03-10 07:05:53.000000000 +0000
@@ -1,3 +1,20 @@
+lksctp-tools (1.0.11+dfsg-2) unstable; urgency=low
+
+  * Switch to source format 3.0 (quilt)
+    - Add debian/source/format.
+    - Remove /usr/share/cdbs/1/rules/simple-patchsys.mk from debian/rules.
+  * Bump debhelper compatibility level to 8. Update Build-Depends on debhelper
+    accordingly.
+  * Bump Standards-Version to 3.9.1. No further changes.
+  * Switch from cdbs to dh
+    - Drop Build-Depends on cdbs.
+    - Convert debian/rules to use dh.
+    - Add debian/lksctp-tools.docs to install README and AUTHORS file.
+  * debian/patches/01-withsctp-quote-command-line-args.patch
+    - Properly quote command line arguments in withsctp. (Closes: #606322)
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 10 Mar 2011 08:05:43 +0100
+
 lksctp-tools (1.0.11+dfsg-1) unstable; urgency=low
 
   * New upstream release
diff -Nru lksctp-tools-1.0.11+dfsg/debian/compat lksctp-tools-1.0.11+dfsg/debian/compat
--- lksctp-tools-1.0.11+dfsg/debian/compat	2011-04-30 22:13:45.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/compat	2011-03-10 06:44:20.000000000 +0000
@@ -1 +1 @@
-7
+8
diff -Nru lksctp-tools-1.0.11+dfsg/debian/control lksctp-tools-1.0.11+dfsg/debian/control
--- lksctp-tools-1.0.11+dfsg/debian/control	2011-04-30 22:13:45.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/control	2011-03-10 06:48:22.000000000 +0000
@@ -2,8 +2,8 @@
 Section: net
 Priority: optional
 Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 7), autotools-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 8), autotools-dev
+Standards-Version: 3.9.1
 Homepage: http://lksctp.sf.net/
 
 Package: libsctp1
diff -Nru lksctp-tools-1.0.11+dfsg/debian/lksctp-tools.docs lksctp-tools-1.0.11+dfsg/debian/lksctp-tools.docs
--- lksctp-tools-1.0.11+dfsg/debian/lksctp-tools.docs	1970-01-01 00:00:00.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/lksctp-tools.docs	2011-03-10 06:53:47.000000000 +0000
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -Nru lksctp-tools-1.0.11+dfsg/debian/patches/01-withsctp-quote-command-line-args.patch lksctp-tools-1.0.11+dfsg/debian/patches/01-withsctp-quote-command-line-args.patch
--- lksctp-tools-1.0.11+dfsg/debian/patches/01-withsctp-quote-command-line-args.patch	1970-01-01 00:00:00.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/patches/01-withsctp-quote-command-line-args.patch	2011-03-10 07:05:30.000000000 +0000
@@ -0,0 +1,13 @@
+Description: Properly quote command line arguments in withsctp
+Author: Mikko Markus Torni <mikko.markus.torni@iki.fi>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606322
+Index: lksctp-tools/src/withsctp/withsctp.in
+===================================================================
+--- lksctp-tools.orig/src/withsctp/withsctp.in	2011-03-10 08:03:38.600141002 +0100
++++ lksctp-tools/src/withsctp/withsctp.in	2011-03-10 08:03:41.784141001 +0100
+@@ -9,4 +9,4 @@
+     exit 1;
+ fi
+ 
+-exec $*
++exec "$*"
diff -Nru lksctp-tools-1.0.11+dfsg/debian/patches/series lksctp-tools-1.0.11+dfsg/debian/patches/series
--- lksctp-tools-1.0.11+dfsg/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/patches/series	2011-03-10 07:03:49.000000000 +0000
@@ -0,0 +1 @@
+01-withsctp-quote-command-line-args.patch
diff -Nru lksctp-tools-1.0.11+dfsg/debian/rules lksctp-tools-1.0.11+dfsg/debian/rules
--- lksctp-tools-1.0.11+dfsg/debian/rules	2011-04-30 22:13:45.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/rules	2011-03-10 06:48:14.000000000 +0000
@@ -1,9 +1,8 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_INSTALL_DOCS_ALL := README AUTHORS
+%:
+	dh $@ --with autotools_dev
+
 # Do not create a shlibs file for libwithsctp.
-DEB_DH_MAKESHLIBS_ARGS_lksctp-tools := -Xlibwithsctp
+override_dh_makeshlibs:
+	dh_makeshlibs -Xlibwithsctp
diff -Nru lksctp-tools-1.0.11+dfsg/debian/source/format lksctp-tools-1.0.11+dfsg/debian/source/format
--- lksctp-tools-1.0.11+dfsg/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ lksctp-tools-1.0.11+dfsg/debian/source/format	2011-04-30 22:13:45.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)