diff -u lilo-22.8/debian/changelog lilo-22.8/debian/changelog
--- lilo-22.8/debian/changelog
+++ lilo-22.8/debian/changelog
@@ -1,3 +1,11 @@
+lilo (1:22.8-10ubuntu1) natty; urgency=low
+
+  * Merge from debian.  Remaining changes: (LP: #704234)
+    - 03_boot-prompt.patch, 03_lilo-version.patch:
+      + Change Debian branding to Ubuntu.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sun, 20 Feb 2011 01:44:00 +0100
+
 lilo (1:22.8-10) unstable; urgency=low
 
   * debian/control:
@@ -7,6 +15,14 @@
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Tue, 14 Dec 2010 18:02:55 +0100
 
+lilo (1:22.8-9ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable(LP: #690090). Remaining changes:
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 14 Dec 2010 12:58:18 +0100
+
 lilo (1:22.8-9) unstable; urgency=low
 
   * New maintainter.
@@ -34,6 +50,14 @@
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Fri, 10 Dec 2010 22:21:25 +0100
 
+lilo (1:22.8-8.3ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable(LP: #669363). Remaining change:
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 01 Nov 2010 14:15:56 +0530
+
 lilo (1:22.8-8.3) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -64,6 +88,15 @@
 
  -- Christian Perrier <bubulle@debian.org>  Mon, 14 Sep 2009 19:54:16 +0200
 
+lilo (1:22.8-8ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #409321
+    - debian/control: Build for lpia, too.
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 05 Aug 2009 18:43:40 +0530
+
 lilo (1:22.8-8) unstable; urgency=low
 
   * Fix some more bashisms. (Closes: #535399)
@@ -72,6 +105,15 @@
 
  -- William Pitcock <nenolod@dereferenced.org>  Sat, 01 Aug 2009 15:54:10 -0500
 
+lilo (1:22.8-7ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #304346)
+    - debian/control: Build for lpia, too.
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Tue, 02 Dec 2008 16:26:42 +0530
+
 lilo (1:22.8-7) unstable; urgency=low
 
   [ William Pitcock ]
@@ -90,6 +132,15 @@
 
  -- William Pitcock <nenolod@dereferenced.org>  Sat, 15 Nov 2008 11:01:59 -0600
 
+lilo (1:22.8-6.4ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - debian/control: Build for lpia, too.
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 04 Nov 2008 12:08:07 +0100
+
 lilo (1:22.8-6.4) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u lilo-22.8/debian/control lilo-22.8/debian/control
--- lilo-22.8/debian/control
+++ lilo-22.8/debian/control
@@ -1,7 +1,8 @@
 Source: lilo
 Section: admin
 Priority: optional
-Maintainer: Joachim Wiedorn <ad_debian@joonet.de>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Joachim Wiedorn <ad_debian@joonet.de>
 Uploaders: Matt Arnold <mattarnold5@gmail.com>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 5.0), transfig, texlive-latex-base, bin86 (>= 0.16), sharutils, po-debconf (>= 0.5.0), libdevmapper-dev, quilt
diff -u lilo-22.8/debian/patches/03_lilo-version.patch lilo-22.8/debian/patches/03_lilo-version.patch
--- lilo-22.8/debian/patches/03_lilo-version.patch
+++ lilo-22.8/debian/patches/03_lilo-version.patch
@@ -5,7 +5,7 @@
         printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR,
  	      VERSION_EDIT, test ? " (test mode)" : "");
  	if (version && verbose<=0) {
-+    	    printf (" (Debian GNU/Linux)");
++    	    printf (" (Ubuntu)");
  	    printf("\n");
  	    return 0;
  	}
@@ -13,7 +13,7 @@
  	    }
  #endif
  	}
-+	printf ("Debian GNU/Linux\n");
++	printf ("Ubuntu\n");
          printf("\n");
          if (version) return 0;
      }
diff -u lilo-22.8/debian/patches/03_boot-prompt.patch lilo-22.8/debian/patches/03_boot-prompt.patch
--- lilo-22.8/debian/patches/03_boot-prompt.patch
+++ lilo-22.8/debian/patches/03_boot-prompt.patch
@@ -7,7 +7,7 @@
  str_title:
 -	.ascii	"LILO"
 -#ifdef LCF_VERSION
-+	.ascii  "Debian GNU/Linux -"
++	.ascii  "Ubuntu -"
  	.ascii	" "	
 -	.ascii	S(VERSION_MAJOR)
 -	.ascii	"."