diff -pruN 0.5.4-2/debian/changelog 0.5.4-2ubuntu1/debian/changelog
--- 0.5.4-2/debian/changelog	2008-06-10 01:14:16.000000000 +0100
+++ 0.5.4-2ubuntu1/debian/changelog	2008-06-10 01:13:05.000000000 +0100
@@ -1,3 +1,11 @@
+efibootmgr (0.5.4-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build packages for lpia as well.
+    - Set Ubuntu maintainer
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 09 Jun 2008 14:05:32 -0700
+
 efibootmgr (0.5.4-2) unstable; urgency=low
 
   * build depend on libpci-dev instead of pcituils-dev, closes: #478374
@@ -10,6 +18,14 @@ efibootmgr (0.5.4-1) unstable; urgency=l
 
  -- Bdale Garbee <bdale@gag.com>  Sun, 24 Feb 2008 17:30:01 -0700
 
+efibootmgr (0.5.3-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build packages for lpia as well.
+    - Set Ubuntu maintainer
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 12 Dec 2007 18:07:03 -0800
+
 efibootmgr (0.5.3-3) unstable; urgency=low
 
   * fix FTBFS, closes: #450448
@@ -17,6 +33,25 @@ efibootmgr (0.5.3-3) unstable; urgency=l
 
  -- Bdale Garbee <bdale@gag.com>  Tue, 11 Dec 2007 23:04:09 -0700
 
+efibootmgr (0.5.3-2ubuntu2) gutsy; urgency=low
+
+  * Build packages for lpia as well.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 15 Aug 2007 23:50:29 +1000
+
+efibootmgr (0.5.3-2ubuntu1) feisty; urgency=low
+
+  * Add -lz to src/efibootmgr/module.mk since pciutils now uses zlib.
+    Fixes FTBFS.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 14 Mar 2007 12:08:06 +0100
+
+efibootmgr (0.5.3-2build1) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:15:22 +0000
+
 efibootmgr (0.5.3-2) unstable; urgency=low
 
   * merge patch from Sam Hocevar (thanks!), closes: #389923
@@ -170,3 +205,4 @@ efibootmgr (0.3.2-1) unstable; urgency=l
   * Initial Release.
 
  -- Bdale Garbee <bdale@gag.com>  Tue, 10 Jul 2001 15:37:11 -0600
+
diff -pruN 0.5.4-2/debian/control 0.5.4-2ubuntu1/debian/control
--- 0.5.4-2/debian/control	2008-06-10 01:14:16.000000000 +0100
+++ 0.5.4-2ubuntu1/debian/control	2008-06-10 01:13:05.000000000 +0100
@@ -1,12 +1,13 @@
 Source: efibootmgr
 Section: admin
 Priority: optional
-Maintainer: Bdale Garbee <bdale@gag.com>
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Depends: debhelper (>> 5), docbook-to-man, libpci-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
 Package: efibootmgr
-Architecture: amd64 i386 ia64
+Architecture: amd64 i386 ia64 lpia
 Depends: ${shlibs:Depends}
 Description: Interact with the EFI Boot Manager 
  This is a Linux user-space application to modify the Intel Extensible