diff --git a/conf.default/config.xml b/conf.default/config.xml
index bbb5acb666..bb94cd8713 100644
--- a/conf.default/config.xml
+++ b/conf.default/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <pfsense>
-	<version>11.6</version>
+	<version>11.7</version>
 	<lastchange/>
 	<theme>pfsense_ng</theme>
 	<system>
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index f3233f97e7..6a16bc23f9 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -73,7 +73,7 @@ $g = array(
 	"disablecrashreporter" => false,
 	"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
 	"debug" => false,
-	"latest_config" => "11.6",
+	"latest_config" => "11.7",
 	"nopkg_platforms" => array("cdrom"),
 	"minimum_ram_warning" => "101",
 	"minimum_ram_warning_text" => "128 MB",
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 690db4596f..572c06b15e 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3552,4 +3552,21 @@ function upgrade_115_to_116() {
 	}
 }
 
+function upgrade_116_to_117() {
+    global $config;
+
+    if (!isset($config['installedpackages']['miniupnpd']['config'][0]))
+        return;
+
+    $miniupnpd =& $config['installedpackages']['miniupnpd']['config'][0];
+
+    $miniupnpd['row'] = array();
+
+    for ($i = 1; $i <= 4; $i++) {
+        if (isset($miniupnpd["permuser{$i}"]) && !empty($miniupnpd["permuser{$i}"])) {
+            $miniupnpd['row'][] = array('permuser' => $miniupnpd["permuser{$i}"]);
+            unset($miniupnpd["permuser{$i}"]);
+        }
+    }
+}
 ?>