diff --git a/debian/changelog b/debian/changelog
index 5401efb..d7878e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
 xmlunit (1.3-2) unstable; urgency=low
 
-  UNRELEASED, FTBFS due to bug #634563 in dblatex
+  UNRELEASED
   * Team upload.
   * Add Vcs-* headers.
   * Change Depends: default-jdk-doc.
   * Update Standards-Version: 3.9.1.
   * Switch to source format 3.0.
+  * Add a patch to workaround bug #634563 in dblatex.
 
- -- Torsten Werner <twerner@debian.org>  Wed, 31 Aug 2011 22:09:16 +0200
+ -- Torsten Werner <twerner@debian.org>  Wed, 07 Sep 2011 13:31:32 +0200
 
 xmlunit (1.3-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch b/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
new file mode 100644
index 0000000..b74fb80
--- /dev/null
+++ b/debian/patches/0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
@@ -0,0 +1,20 @@
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Wed, 7 Sep 2011 13:23:05 +0200
+Subject: Fix DOCTYPE in XMLUnit-Java.xml.
+
+---
+ src/user-guide/XMLUnit-Java.xml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/user-guide/XMLUnit-Java.xml b/src/user-guide/XMLUnit-Java.xml
+index e93b0d3..2d0f8e3 100644
+--- a/src/user-guide/XMLUnit-Java.xml
++++ b/src/user-guide/XMLUnit-Java.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "http://docbook.org/xml/simple/1.1b1/sdocbook.dtd">
++<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
+ 
+ <article>
+   <title>XMLUnit Java User's Guide
+-- 
diff --git a/debian/patches/0002-Ignore-test-failures.patch b/debian/patches/0002-Ignore-test-failures.patch
new file mode 100644
index 0000000..20364c5
--- /dev/null
+++ b/debian/patches/0002-Ignore-test-failures.patch
@@ -0,0 +1,21 @@
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Wed, 7 Sep 2011 13:23:05 +0200
+Subject: Ignore test failures.
+
+---
+ build.xml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index d33b9b7..c0a15a5 100644
+--- a/build.xml
++++ b/build.xml
+@@ -164,7 +164,6 @@ POSSIBILITY OF SUCH DAMAGE.
+       <report format="frames" todir="${test.report.dir}/html"/>
+     </junitreport>
+ 
+-    <fail if="tests.failed">Some tests failed</fail>
+   </target>
+ 
+   <target name="docs"
+-- 
diff --git a/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch b/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch
new file mode 100644
index 0000000..4564152
--- /dev/null
+++ b/debian/patches/0003-Remove-image-from-title-as-a-workaround.patch
@@ -0,0 +1,25 @@
+From: Torsten Werner <twerner@debian.org>
+Date: Wed, 7 Sep 2011 13:26:46 +0200
+Subject: Remove image from title as a workaround.
+
+Otherwise dblatex fails due to bug #634563.
+---
+ src/user-guide/XMLUnit-Java.xml |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/user-guide/XMLUnit-Java.xml b/src/user-guide/XMLUnit-Java.xml
+index 2d0f8e3..200c393 100644
+--- a/src/user-guide/XMLUnit-Java.xml
++++ b/src/user-guide/XMLUnit-Java.xml
+@@ -3,10 +3,6 @@
+ 
+ <article>
+   <title>XMLUnit Java User's Guide
+-    <inlinemediaobject><imageobject>
+-        <imagedata fileref="xmlunit.png" width="331" depth="100"
+-          valign="middle" format="PNG"/>
+-      </imageobject></inlinemediaobject>
+   </title>
+   <articleinfo>
+     <authorgroup>
+-- 
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
deleted file mode 100644
index baf0095..0000000
--- a/debian/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -164,7 +164,6 @@
-       <report format="frames" todir="${test.report.dir}/html"/>
-     </junitreport>
- 
--    <fail if="tests.failed">Some tests failed</fail>
-   </target>
- 
-   <target name="docs"
diff --git a/debian/patches/docbook.patch b/debian/patches/docbook.patch
deleted file mode 100644
index 5da23cd..0000000
--- a/debian/patches/docbook.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/user-guide/XMLUnit-Java.xml
-+++ b/src/user-guide/XMLUnit-Java.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "http://docbook.org/xml/simple/1.1b1/sdocbook.dtd">
-+<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
- 
- <article>
-   <title>XMLUnit Java User's Guide
diff --git a/debian/patches/series b/debian/patches/series
index 5e09601..10904a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-docbook.patch
-build.patch
+0001-Fix-DOCTYPE-in-XMLUnit-Java.xml.patch
+0002-Ignore-test-failures.patch
+0003-Remove-image-from-title-as-a-workaround.patch