diff --git a/ChangeLog b/ChangeLog
index 508f6795db..eefc227600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.6.5.1 (2016-11-25)
 - issue #12735 Incorrect parameters to escapeString in Node.php
 - issue #12734 Fix PHP error when mbstring is not installed
+- issue #12736 Don't force partition count to be specified when creating a new table
 
 4.6.5 (2016-11-24)
 - issue        Remove potentionally license problematic sRGB profile
diff --git a/libraries/tbl_partition_definition.inc.php b/libraries/tbl_partition_definition.inc.php
index 0ec3dc6f0b..fb2f490ff5 100644
--- a/libraries/tbl_partition_definition.inc.php
+++ b/libraries/tbl_partition_definition.inc.php
@@ -28,14 +28,16 @@ if (!isset($partitionDetails)) {
     } else {
         $partition_count = 0;
     }
-    $partitionDetails['partition_count'] = $partition_count;
+    $partitionDetails['partition_count']
+        = ($partition_count === 0) ? '' : $partition_count;
     if (PMA_isValid($_REQUEST['subpartition_count'], 'numeric')) {
         // MySQL's limit is 8192, so do not allow more
         $subpartition_count = min(intval($_REQUEST['subpartition_count']), 8192);
     } else {
         $subpartition_count = 0;
     }
-    $partitionDetails['subpartition_count'] = $subpartition_count;
+    $partitionDetails['subpartition_count']
+        = ($subpartition_count === 0) ? '' : $subpartition_count;
 
     // Only LIST and RANGE type parameters allow subpartitioning
     $partitionDetails['can_have_subpartitions'] = $partition_count > 1