diff -u albatross-1.36/doc/Makefile albatross-1.36/doc/Makefile
--- albatross-1.36/doc/Makefile
+++ albatross-1.36/doc/Makefile
@@ -1,10 +1,9 @@
 PYTHON = python
 
-MKHOWTO = /usr/lib/python2.3/doc/tools/mkhowto
+MKHOWTO = /usr/lib/python2.5/doc/tools/mkhowto
 PYDIR=$(shell $(PYTHON) -c 'import os; print os.path.dirname(os.__file__)')
 
 DOC_ROOT = $(PYDIR)/doc
-MKHOWTO = $(DOC_ROOT)/tools/mkhowto
 ICONS = $(DOC_ROOT)/html/icons
 
 .PHONY: html
diff -u albatross-1.36/debian/changelog albatross-1.36/debian/changelog
--- albatross-1.36/debian/changelog
+++ albatross-1.36/debian/changelog
@@ -1,3 +1,9 @@
+albatross (1.36-5ubuntu1) jaunty; urgency=low
+
+  * Use mkhowto provided by Python 2.5 to build the documentation (LP: #356684).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sat, 11 Apr 2009 10:14:11 +0200
+
 albatross (1.36-5) unstable; urgency=low
 
   * debian/control: Build-depend on ghostscript instead of obsolete gs-gpl.
diff -u albatross-1.36/debian/control albatross-1.36/debian/control
--- albatross-1.36/debian/control
+++ albatross-1.36/debian/control
@@ -1,7 +1,8 @@
 Source: albatross
 Section: python
 Priority: optional
-Maintainer: Fabian Fagerholm <fabbe@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Fabian Fagerholm <fabbe@debian.org>
 Build-Depends: debhelper (>= 5.0.37.1), python (>= 2.3.5-7), python-all-dev
 Build-Depends-Indep: python-central (>= 0.5), docbook-to-man, texlive-base, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-base, texlive-latex-extra, dia (>= 0.94.0), ghostscript, fakeroot
 Standards-Version: 3.8.0