diff -Nru hw-detect-1.117ubuntu1/debian/changelog hw-detect-1.117ubuntu2/debian/changelog
--- hw-detect-1.117ubuntu1/debian/changelog	2016-04-04 13:43:19.000000000 +0000
+++ hw-detect-1.117ubuntu2/debian/changelog	2016-04-14 13:16:19.000000000 +0000
@@ -1,3 +1,9 @@
+hw-detect (1.117ubuntu2) xenial; urgency=medium
+
+  * Enable disk-detect/multipath/enable by default on s390x.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 14 Apr 2016 14:16:02 +0100
+
 hw-detect (1.117ubuntu1) xenial; urgency=low
 
   * Merge 1.117 from debian to pick up fix for LP: #1559193.
diff -Nru hw-detect-1.117ubuntu1/debian/disk-detect.templates hw-detect-1.117ubuntu2/debian/disk-detect.templates
--- hw-detect-1.117ubuntu1/debian/disk-detect.templates	2016-03-01 20:14:57.000000000 +0000
+++ hw-detect-1.117ubuntu2/debian/disk-detect.templates	2016-04-14 13:15:48.000000000 +0000
@@ -33,7 +33,7 @@
 
 Template: disk-detect/multipath/enable
 Type: boolean
-Default: false
+Default: #MULTIPATH_DETECT#
 Description: for internal use; can be preseeded
  Check for the presence of multipath devices?
 
diff -Nru hw-detect-1.117ubuntu1/debian/rules hw-detect-1.117ubuntu2/debian/rules
--- hw-detect-1.117ubuntu1/debian/rules	2016-03-01 20:14:57.000000000 +0000
+++ hw-detect-1.117ubuntu2/debian/rules	2016-04-14 13:15:48.000000000 +0000
@@ -1,7 +1,18 @@
 #! /usr/bin/make -f
+include /usr/share/dpkg/default.mk
+
 %:
 	dh $@
 
+DISK_DETECT=false
+ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
+DISK_DETECT=true
+endif
+
 override_dh_auto_install:
 	$(foreach PACKAGE, $(shell dh_listpackages), \
 	  $(MAKE) install-$(PACKAGE) DESTDIR=$(CURDIR)/debian/$(PACKAGE);)
+
+override_dh_installdebconf:
+	dh_installdebconf
+	sed 's/#MULTIPATH_DETECT#/$(DISK_DETECT)/' -i debian/disk-detect/DEBIAN/templates