diff --git a/ccid/trunk/trunk/debian/control b/ccid/trunk/trunk/debian/control
index 73c60ca..13cfe75 100644
--- a/ccid/trunk/trunk/debian/control
+++ b/ccid/trunk/trunk/debian/control
@@ -2,7 +2,7 @@ Source: ccid
 Section: libs
 Priority: extra
 Maintainer: Ludovic Rousseau <rousseau@debian.org>
-Build-Depends: debhelper (>= 5.0.45), libusb-dev (>= 0.1.6a-2.1), libpcsclite-dev (>= 1.3.3-1), flex, autotools-dev, pkg-config
+Build-Depends: debhelper (>= 5.0.45), libusb-dev (>= 0.1.6a-2.1), libpcsclite-dev (>= 1.3.3-1), flex, autotools-dev, pkg-config, dpatch
 Standards-Version: 3.7.3
 Homepage: http://pcsclite.alioth.debian.org/ccid.html
 
diff --git a/ccid/trunk/trunk/debian/rules b/ccid/trunk/trunk/debian/rules
index 8871cc2..2b25f47 100755
--- a/ccid/trunk/trunk/debian/rules
+++ b/ccid/trunk/trunk/debian/rules
@@ -31,6 +31,9 @@ endif
 tag:
 	cvs tag -c -F $(subst .,_,debian_version_$(version))
 
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -45,7 +48,7 @@ configure-stamp:
 
 
 build: build-stamp
-build-stamp: configure-stamp 
+build-stamp: patch configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -53,7 +56,8 @@ build-stamp: configure-stamp
 
 	touch build-stamp
 
-clean:
+clean: clean1 unpatch
+clean1:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -127,4 +131,5 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+	patch unpatch clean1