diff -u vdradmin-am-3.6.2/debian/changelog vdradmin-am-3.6.2/debian/changelog
--- vdradmin-am-3.6.2/debian/changelog
+++ vdradmin-am-3.6.2/debian/changelog
@@ -1,3 +1,10 @@
+vdradmin-am (3.6.2-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #305039):
+    - debian/rules: Enable UTF8-support for the po-files.
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Sat, 13 Dec 2008 10:05:18 -0800
+
 vdradmin-am (3.6.2-2) unstable; urgency=low
 
   * Now taking /etc/default/locale into account, when setting the locale for the
@@ -23,6 +30,14 @@
 
  -- Tobias Grimm <tg@e-tobi.net>  Fri, 01 Aug 2008 20:46:08 +0200
 
+vdradmin-am (3.6.1-2ubuntu1) hardy; urgency=low
+
+  * New version from Debian unstable.
+  * rules: Enable UTF8-support for the po-files.
+  * Change the maintainer address.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 19 Feb 2008 00:23:54 +0200
+
 vdradmin-am (3.6.1-2) unstable; urgency=low
 
   * Removed reference of $DAEMON_OPTS in /etc/default/vdradmin-am,
diff -u vdradmin-am-3.6.2/debian/control vdradmin-am-3.6.2/debian/control
--- vdradmin-am-3.6.2/debian/control
+++ vdradmin-am-3.6.2/debian/control
@@ -1,7 +1,8 @@
 Source: vdradmin-am
 Section: web
 Priority: optional
-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <etobi@debian.org>
 Build-Depends: debhelper (>= 5), dpatch
 Standards-Version: 3.8.0
diff -u vdradmin-am-3.6.2/debian/rules vdradmin-am-3.6.2/debian/rules
--- vdradmin-am-3.6.2/debian/rules
+++ vdradmin-am-3.6.2/debian/rules
@@ -17,11 +17,14 @@
 	#-$(MAKE) clean
 	@rm -f vdradmind vdradmind.1
 	dh_clean
+	./make.sh utf8clean
 
 build: patch-stamp
 	#$(MAKE) all
 	# 
 	# Note: all files are installed using dh_install 
+	./make.sh utf8add
+	./make.sh po
 
 install: build
 	dh_testdir