diff -u hydrogen-0.9.3/debian/patches/00_docbook.patch hydrogen-0.9.3/debian/patches/00_docbook.patch
--- hydrogen-0.9.3/debian/patches/00_docbook.patch
+++ hydrogen-0.9.3/debian/patches/00_docbook.patch
@@ -1,6 +1,78 @@
-diff -ruN hydrogen-0.9.3-old/Makefile.in hydrogen-0.9.3/Makefile.in
---- hydrogen-0.9.3-old/Makefile.in	2005-11-10 19:00:08.000000000 +0100
-+++ hydrogen-0.9.3/Makefile.in	2006-03-02 09:45:45.000000000 +0100
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/manual_en.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/manual_en.docbook
+--- hydrogen-0.9.3/data/doc/manual_en.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/manual_en.docbook	2007-05-03 11:20:39.595341484 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-manual" lang="en">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/manual_es.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/manual_es.docbook
+--- hydrogen-0.9.3/data/doc/manual_es.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/manual_es.docbook	2007-05-03 11:20:52.371466596 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-manual" lang="es">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/manual_fr.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/manual_fr.docbook
+--- hydrogen-0.9.3/data/doc/manual_fr.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/manual_fr.docbook	2007-05-03 11:20:59.011531626 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-manual" lang="fr">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/manual_it.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/manual_it.docbook
+--- hydrogen-0.9.3/data/doc/manual_it.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/manual_it.docbook	2007-05-03 11:21:05.155591803 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-manual" lang="it">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/manual_nl.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/manual_nl.docbook
+--- hydrogen-0.9.3/data/doc/manual_nl.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/manual_nl.docbook	2007-05-03 11:21:10.347642658 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-handleiding" lang="nl">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/tutorial_en.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/tutorial_en.docbook
+--- hydrogen-0.9.3/data/doc/tutorial_en.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/tutorial_en.docbook	2007-05-03 11:21:16.483702763 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-tutorial" lang="it">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/tutorial_fr.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/tutorial_fr.docbook
+--- hydrogen-0.9.3/data/doc/tutorial_fr.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/tutorial_fr.docbook	2007-05-03 11:21:22.563762323 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-tutorial" lang="fr">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/data/doc/tutorial_it.docbook hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/data/doc/tutorial_it.docbook
+--- hydrogen-0.9.3/data/doc/tutorial_it.docbook	2005-10-18 07:32:04.000000000 +0900
++++ hydrogen-0.9.3/data/doc/tutorial_it.docbook	2007-05-03 11:21:28.403819536 +0900
+@@ -1,4 +1,4 @@
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN">
+ 
+ <book id="Hydrogen-tutorial" lang="it">
+ 
+diff -Nur hydrogen-0.9.3/build-tree/hydrogen-0.9.3/Makefile.in hydrogen-0.9.3.new/build-tree/hydrogen-0.9.3/Makefile.in
+--- hydrogen-0.9.3/Makefile.in	2005-11-11 03:00:08.000000000 +0900
++++ hydrogen-0.9.3/Makefile.in	2007-05-03 11:20:05.351006221 +0900
 @@ -219,6 +219,14 @@
  	@make -f hydrogenCUI.mak hydrogenCUI
  
diff -u hydrogen-0.9.3/debian/changelog hydrogen-0.9.3/debian/changelog
--- hydrogen-0.9.3/debian/changelog
+++ hydrogen-0.9.3/debian/changelog
@@ -1,3 +1,13 @@
+hydrogen (0.9.3-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Added docbook to build-depends
+    - Updated docbook DTD to 4.4 (with 00_docbook.patch)to fix FTBFS
+    - Updated FSF address in debian/copyright
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Mon, 18 Jun 2007 23:37:34 +0200
+
 hydrogen (0.9.3-4) unstable; urgency=low
 
   * incorporated patch for building with flac (thanks guys !) library (closes: #426650,#427745)
@@ -12,6 +22,15 @@
 
  -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 24 Jan 2007 08:50:39 +0100
 
+hydrogen (0.9.3-2ubuntu1) gutsy; urgency=low
+
+  * Updated docbook DTD to 4.4 (no changes)to fix FTBFS (LP: 111832)
+  * Added docbook to build-depends
+  * Updated FSF address in debian/copyright
+  * Added XSBC-Original-Maintainer
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Thu, 03 May 2007 12:37:56 +0900
+
 hydrogen (0.9.3-2) unstable; urgency=low
 
   * Added desktop file (closes: 351884)(closes: #376899)
diff -u hydrogen-0.9.3/debian/control hydrogen-0.9.3/debian/control
--- hydrogen-0.9.3/debian/control
+++ hydrogen-0.9.3/debian/control
@@ -1,8 +1,9 @@
 Source: hydrogen
 Section: sound
 Priority: optional
-Maintainer: Guenter Geiger (Debian/GNU) <geiger@debian.org>
-Build-Depends: docbook-utils, debhelper (>> 3.0.0), cdbs, libqt3-mt-dev, libz-dev, pkg-config, libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guenter Geiger (Debian/GNU) <geiger@debian.org>
+Build-Depends: docbook-utils, debhelper (>> 3.0.0), cdbs, libqt3-mt-dev, libz-dev, pkg-config, libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], docbook
 Standards-Version: 3.6.2
 
 Package: hydrogen
diff -u hydrogen-0.9.3/debian/copyright hydrogen-0.9.3/debian/copyright
--- hydrogen-0.9.3/debian/copyright
+++ hydrogen-0.9.3/debian/copyright
@@ -18,8 +18,8 @@
 
 You should have received a copy of the GNU General Public License
 along with this package; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.