diff --git a/debian/changelog b/debian/changelog
index a44926f..3f55f60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 postfwd (1.18-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Add dpatch infrastructure
 
  -- Jan Wagner <waja@cyconet.org>  Thu, 29 Apr 2010 08:49:20 +0200
 
diff --git a/debian/control b/debian/control
index 5e8f08d..c932674 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: postfwd
 Section: mail
 Priority: optional
 Maintainer: Jan Wagner <waja@cyconet.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), dpatch
 Homepage: http://www.postfwd.org/
 Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/postfwd
 Vcs-Svn: https://scm.uncompleted.org/svn/debian/postfwd/trunk
diff --git a/debian/rules b/debian/rules
index 0d77979..539d0f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build:
+include /usr/share/dpatch/dpatch.make
 
-clean:
+build: patch-stamp
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean