diff -Nru kickseed-0.48/debian/changelog kickseed-0.48ubuntu1/debian/changelog
--- kickseed-0.48/debian/changelog	2008-02-15 13:05:38.000000000 +0000
+++ kickseed-0.48ubuntu1/debian/changelog	2008-04-30 10:43:04.000000000 +0100
@@ -1,3 +1,11 @@
+kickseed (0.48ubuntu1) hardy-proposed; urgency=low
+
+  * Backport from trunk:
+    - Adjust 'bootloader --md5pass' for changes in grub-installer 1.31
+      (LP: #221501).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 30 Apr 2008 10:43:03 +0100
+
 kickseed (0.48) unstable; urgency=low
 
   [ Colin Watson ]
diff -Nru kickseed-0.48/debian/control kickseed-0.48ubuntu1/debian/control
--- kickseed-0.48/debian/control	2008-02-13 13:38:51.000000000 +0000
+++ kickseed-0.48ubuntu1/debian/control	2008-04-30 10:42:59.000000000 +0100
@@ -1,7 +1,8 @@
 Source: kickseed
 Section: debian-installer
 Priority: optional
-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Colin Watson <cjwatson@debian.org>
 Build-Depends: debhelper (>= 4.2), dpkg-dev (>= 1.9)
 
diff -Nru kickseed-0.48/handlers/bootloader.sh kickseed-0.48ubuntu1/handlers/bootloader.sh
--- kickseed-0.48/handlers/bootloader.sh	2008-02-13 13:38:50.000000000 +0000
+++ kickseed-0.48ubuntu1/handlers/bootloader.sh	2008-04-30 10:41:20.000000000 +0100
@@ -33,9 +33,8 @@
 				shift 2
 				;;
 			--md5pass)
-				# requires grub-installer 1.09
-				ks_preseed d-i grub-installer/password password "$2"
-				ks_preseed d-i grub-installer/password-crypted boolean true
+				# requires grub-installer 1.31
+				ks_preseed d-i grub-installer/password-crypted password "$2"
 				shift 2
 				;;
 			--useLilo)