diff --git a/debian/changelog b/debian/changelog
index d632821..2614a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@
     from the upstream version.
   * Further improve get-orig-source target in debian/rules.
   * Move upstream URL from the description to the new Homepage field.
+  * Use quilt for patching instead of calling patch manually.
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 21 Sep 2007 13:54:36 +0200
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Tue, 02 Oct 2007 20:47:35 +0200
 
 libmicroba-java (1:0.4.4.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9e3dedc..18b23b2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt
 Build-Depends-Indep: ant, unzip, java-gcj-compat-dev, libjgraph-java
 Standards-Version: 3.7.2
 Homepage: http://microba.sourceforge.net/
diff --git a/debian/patches/jgraph.patch b/debian/patches/jgraph.patch
index 93da2ab..5cdea97 100644
--- a/debian/patches/jgraph.patch
+++ b/debian/patches/jgraph.patch
@@ -1,11 +1,19 @@
---- build.xml.org	2006-12-25 21:00:40.000000000 +0100
-+++ build.xml	2006-12-25 21:00:45.000000000 +0100
-@@ -11,3 +11,3 @@
+Index: libmicroba-java-NM/build.xml
+===================================================================
+--- libmicroba-java-NM.orig/build.xml	2007-10-02 20:50:17.000000000 +0200
++++ libmicroba-java-NM/build.xml	2007-10-02 20:50:27.000000000 +0200
+@@ -9,7 +9,7 @@
+ 	<property name="maven-pack" value="microba-${version}-maven.jar" />
+ 
  	<path id="compile-classpath">
 -		<pathelement location="lib-compiletime/jgraph.jar" />
 +		<pathelement location="/usr/share/java/jgraph.jar" />
  	</path>
-@@ -122,2 +122,2 @@
+ 
+ 	<target name="src_release">
+@@ -129,4 +129,4 @@
+ 
+ 
  
 -</project>
 \ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cc30b52
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+jgraph.patch
diff --git a/debian/rules b/debian/rules
index fe6a187..4502526 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
 
 TARBALL ?= $(shell uscan --force-download --verbose | tail -n 2 | perl -ne 'print $$_ if s;.*(microba-[\d\.]+-full.zip).*;../$$1;')
 VERSION ?= $(shell echo $(TARBALL) | perl -pe 's;../microba-(.+)-full.zip;$$1;')
@@ -26,18 +28,17 @@
 	unzip $(CURDIR)/microba-*-sources.jar -d src
 	unzip $(CURDIR)/microba-*-javadoc.jar -d doc
 	mv $(CURDIR)/src/build.xml $(CURDIR)/
-	patch < $(CURDIR)/debian/patches/jgraph.patch
 	touch configure-stamp
 
 
 build: build-stamp
 
-build-stamp: configure-stamp
+build-stamp: configure-stamp patch
 	dh_testdir
 	ant bin_release
 	touch $@
 
-clean: 
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp