diff -pruN 0.0.35/debian/changelog 0.0.35ubuntu2/debian/changelog
--- 0.0.35/debian/changelog	2016-10-23 21:25:37.000000000 +0000
+++ 0.0.35ubuntu2/debian/changelog	2019-09-09 13:21:26.000000000 +0000
@@ -1,3 +1,20 @@
+zipl-installer (0.0.35ubuntu2) eoan; urgency=medium
+
+  * mpath names in mount and in /dev/mapper are different, due to N vs
+    -partN conversions on and off, sed them again.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 09 Sep 2019 14:21:26 +0100
+
+zipl-installer (0.0.35ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Install s390-tools & sysconfig-hardware in target, such that they
+    are available even if they move out of ubuntu-minimal into standard.
+    - Enable crashkernel=196M paramemter for d-i installs by default.
+    - Apply ubuntu branding.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 19 Jan 2017 13:58:34 +0000
+
 zipl-installer (0.0.35) unstable; urgency=medium
 
   * Copy Ubuntu's fix-up for the btrfs subvolume check from 0.0.33ubuntu2.
@@ -12,6 +29,35 @@ zipl-installer (0.0.34) unstable; urgenc
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 18 Sep 2016 18:45:39 +0200
 
+zipl-installer (0.0.33ubuntu4) xenial; urgency=medium
+
+  * Install s390-tools & sysconfig-hardware in target, such that they are
+    available even if they move out of ubuntu-minimal into standard.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 13 Apr 2016 11:53:35 +0100
+
+zipl-installer (0.0.33ubuntu3) xenial; urgency=medium
+
+  * Reluctantly Bump crashkernel to 196M, as otherwise 128M is not enough
+    by default to collect a kdump on any LPAR, defeating the intended
+    purpose in the first place. (LP: #1564475)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 11 Apr 2016 12:49:46 +0100
+
+zipl-installer (0.0.33ubuntu2) xenial; urgency=medium
+
+  * Test for missing/empty btrfs volume label harder. LP: #1566387.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 05 Apr 2016 16:53:03 +0100
+
+zipl-installer (0.0.33ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian, remaining changes:
+    - Enable crashkernel=128M paramemter for d-i installs by default.
+    - Apply ubuntu branding.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 01 Apr 2016 15:48:03 +0100
+
 zipl-installer (0.0.33) unstable; urgency=medium
 
   * Query /target's btrfs subvolume and correctly add rootfs subvol flag
@@ -19,6 +65,20 @@ zipl-installer (0.0.33) unstable; urgenc
 
  -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 01 Apr 2016 15:45:28 +0100
 
+zipl-installer (0.0.32ubuntu2) xenial; urgency=medium
+
+  * Enable crashkernel=128M paramemter for d-i installs by default. LP:
+    #1555159
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 18 Mar 2016 17:45:45 +0000
+
+zipl-installer (0.0.32ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Apply ubuntu branding.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 29 Feb 2016 08:36:01 +0000
+
 zipl-installer (0.0.32) unstable; urgency=medium
 
   [ Hendrik Brueckner ]
@@ -34,6 +94,12 @@ zipl-installer (0.0.31) unstable; urgenc
 
  -- Christian Perrier <bubulle@debian.org>  Thu, 04 Feb 2016 07:00:48 +0100
 
+zipl-installer (0.0.30ubuntu1) xenial; urgency=high
+
+  * Apply ubuntu branding.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 18 Jan 2016 14:55:01 +0000
+
 zipl-installer (0.0.30) unstable; urgency=medium
 
   * Fix elif/then syntax in postinst script, thanks to Hendrik Brueckner
@@ -484,3 +550,4 @@ zipl-installer (0.0.1) unstable; urgency
   * First release
 
  -- Bastian Blank <waldi@debian.org>  Thu, 20 May 2004 12:18:59 +0200
+
diff -pruN 0.0.35/debian/control 0.0.35ubuntu2/debian/control
--- 0.0.35/debian/control	2016-10-04 10:30:44.000000000 +0000
+++ 0.0.35ubuntu2/debian/control	2016-10-24 05:54:59.000000000 +0000
@@ -1,7 +1,8 @@
 Source: zipl-installer
 Section: debian-installer
 Priority: standard
-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Philipp Kern <pkern@debian.org>, Christian Perrier <bubulle@debian.org>
 Build-Depends: debhelper (>= 9)
 Vcs-Browser: https://anonscm.debian.org/cgit/d-i/zipl-installer.git
diff -pruN 0.0.35/debian/zipl-installer.postinst 0.0.35ubuntu2/debian/zipl-installer.postinst
--- 0.0.35/debian/zipl-installer.postinst	2016-10-23 20:27:21.000000000 +0000
+++ 0.0.35ubuntu2/debian/zipl-installer.postinst	2019-09-09 13:20:58.000000000 +0000
@@ -11,9 +11,16 @@ info() {
 }
 
 findfs() {
-	mount | grep "on /target${1%/} " | tail -n1 | cut -d' ' -f1
+	mount | grep "on /target${1%/} " | tail -n1 | cut -d' ' -f1 | sed 's/\(mpath[a-z]*\)\([0-9]*\)$/\1-part\2/'
 }
 
+# Just in case s390-tools & sysconfig-hardware move from minimal to
+# standard
+# zipl
+apt-install s390-tools || true
+# initramfs hooks
+apt-install sysconfig-hardware || true
+
 rootfs_devfs="$(findfs /)"
 rootfs="$(mapdevfs $rootfs_devfs)"
 log "Root filesystem on ${rootfs} (${rootfs_devfs})"
@@ -41,23 +48,23 @@ defaultmenu = menu
 
 :menu
 target = /boot
-1 = debian
+1 = ubuntu
 2 = old
 default = 1
 prompt = 1
 timeout = 10
 
-[debian]
+[ubuntu]
 target = /boot
 image = /boot/vmlinuz
 ramdisk = /boot/initrd.img
-parameters = $PARAMETER
+parameters = $PARAMETER crashkernel=196M
 
 [old]
 target = /boot
 image = /boot/vmlinuz.old
 ramdisk = /boot/initrd.img.old
-parameters = $PARAMETER
+parameters = $PARAMETER crashkernel=196M
 optional = 1
 EOF
 
