=== modified file 'debian/changelog'
--- a/debian/changelog	2016-08-12 13:19:46 +0000
+++ b/debian/changelog	2016-08-12 13:20:05 +0000
@@ -1,3 +1,12 @@
+partman-base (187ubuntu3) yakkety; urgency=medium
+
+  * On s390[x], Prevent using extended partitions on DASD drives that can
+    only hold 3 partitions. Parted doesn't have special knowledge about
+    that and claims that msdos partition table on DASD drives can hold
+    usual maximum number of partitions types. LP: #1595495.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 23 Jun 2016 12:06:00 +0100
+
 partman-base (187ubuntu2) xenial; urgency=medium
 
   [ Viktor Mihajlovski ]

=== modified file 'parted_server.c'
--- a/parted_server.c	2015-03-08 09:35:34 +0000
+++ b/parted_server.c	2016-08-12 13:20:05 +0000
@@ -957,6 +957,10 @@ possible_extended_partition(PedDisk *dis
         result = (ped_disk_type_check_feature(disk->type,
                                               PED_DISK_TYPE_EXTENDED)
                   && !has_extended_partition(disk)
+#ifdef __s390__
+                  /* DASD drives can only do 3 partitions */
+                  && strcmp(disk->dev->model, "IBM S390 DASD drive")
+#endif
                   && possible_primary_partition(disk, space));
         activate_exception_handler();
         return result;