diff -Nru makedumpfile-1.5.9/debian/changelog makedumpfile-1.5.9/debian/changelog
--- makedumpfile-1.5.9/debian/changelog	2017-07-17 19:58:59.000000000 -0300
+++ makedumpfile-1.5.9/debian/changelog	2017-08-29 16:56:04.000000000 -0300
@@ -1,3 +1,15 @@
+makedumpfile (1:1.5.9-5ubuntu0.6) xenial; urgency=medium
+
+  * d/kernel-postinst-generate-initrd : Add scsi_dh_* modules if in
+    use so the system can dump a crash when root is on multipath
+    (LP: #1635597) (Closes: 862411)
+
+  * KDUMP_CMDLINE_APPEND: add noirqdistrib to default command line. As it's
+    only used by ppc64el, it's not required to be conditionally added.
+    (LP: #1658733)
+
+ -- Thadeu Lima de Souza Cascardo <cascardo@canonical.com>  Tue, 29 Aug 2017 16:56:04 -0300
+
 makedumpfile (1:1.5.9-5ubuntu0.5) xenial; urgency=medium
 
   * Build on arm64. While this version of makedumpfile doesn't support
diff -Nru makedumpfile-1.5.9/debian/kdump-config makedumpfile-1.5.9/debian/kdump-config
--- makedumpfile-1.5.9/debian/kdump-config	2017-01-11 08:33:42.000000000 -0200
+++ makedumpfile-1.5.9/debian/kdump-config	2017-08-29 16:56:04.000000000 -0300
@@ -50,7 +50,7 @@
 NFS_TIMEO=${NFS_TIMEO:=600}
 NFS_RETRANS=${NFS_RETRANS:=3}
 MAKEDUMP_ARGS=${MAKEDUMP_ARGS:="-c -d 31"}
-KDUMP_CMDLINE_APPEND=${KDUMP_CMDLINE_APPEND:="irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service"}
+KDUMP_CMDLINE_APPEND=${KDUMP_CMDLINE_APPEND:="irqpoll noirqdistrib nr_cpus=1 nousb systemd.unit=kdump-tools.service"}
 KDUMP_KERNEL_HOOK="/etc/kernel/postinst.d/kdump-tools"
 [ -d $KDUMP_COREDIR ] || mkdir -p $KDUMP_COREDIR ;
 
diff -Nru makedumpfile-1.5.9/debian/kdump-tools.5 makedumpfile-1.5.9/debian/kdump-tools.5
--- makedumpfile-1.5.9/debian/kdump-tools.5	2016-07-11 11:39:22.000000000 -0300
+++ makedumpfile-1.5.9/debian/kdump-tools.5	2017-08-29 16:56:04.000000000 -0300
@@ -117,7 +117,7 @@
 .B KDUMP_CMDLINE_APPEND
 Additional arguments to append to the command line for the kdump kernel.  
 If not set,  
-.RI \*(lq "irqpoll nr_cpus=1 nousb" \*(rq
+.RI \*(lq "irqpoll noirqdistrib nr_cpus=1 nousb" \*(rq
 will be used.
 .TP
 .B SSH
diff -Nru makedumpfile-1.5.9/debian/kdump-tools.default makedumpfile-1.5.9/debian/kdump-tools.default
--- makedumpfile-1.5.9/debian/kdump-tools.default	2017-01-11 08:33:42.000000000 -0200
+++ makedumpfile-1.5.9/debian/kdump-tools.default	2017-08-29 16:56:04.000000000 -0300
@@ -60,10 +60,10 @@
 # KDUMP_CMDLINE - The default is to use the contents of /proc/cmdline.  
 #     Set this variable to override /proc/cmdline.
 # KDUMP_CMDLINE_APPEND - Additional arguments to append to the command line 
-#     for the kdump kernel.  If unset, it defaults to "irqpoll nr_cpus=1 nousb"
+#     for the kdump kernel.  If unset, it defaults to "irqpoll noirqdistrib nr_cpus=1 nousb"
 #KDUMP_KEXEC_ARGS=""
 #KDUMP_CMDLINE=""
-#KDUMP_CMDLINE_APPEND="irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service"
+#KDUMP_CMDLINE_APPEND="irqpoll noirqdistrib nr_cpus=1 nousb systemd.unit=kdump-tools.service"
 
 # ---------------------------------------------------------------------------
 # Architecture specific Overrides:
diff -Nru makedumpfile-1.5.9/debian/kernel-postinst-generate-initrd makedumpfile-1.5.9/debian/kernel-postinst-generate-initrd
--- makedumpfile-1.5.9/debian/kernel-postinst-generate-initrd	2016-01-05 11:57:33.000000000 -0200
+++ makedumpfile-1.5.9/debian/kernel-postinst-generate-initrd	2017-08-29 16:56:04.000000000 -0300
@@ -39,6 +39,13 @@
 
 initramfsdir="$kdumpdir/initramfs-tools"
 
+# Add scsi_dh_* modules if in use otherwise
+# kexec reboot on multipath will fail
+# (LP: #1635597)
+for I in $(lsmod | grep scsi_dh | cut -d" " -f1);do
+	echo "${I}" >> $initramfsdir/modules
+done
+
 sed -e 's/MODULES=.*/MODULES=dep/' /etc/initramfs-tools/initramfs.conf > "$initramfsdir/initramfs.conf" || true
 if ! [ -e "$initramfsdir/initramfs.conf" ];then
 	echo >&2 "W: kdump-tools: Unable to create $initramfsdir/initramfs.conf"