diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml
index f9fcdbde60..98afef14c6 100644
--- a/src/conf.default/config.xml
+++ b/src/conf.default/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <pfsense>
-	<version>15.3</version>
+	<version>15.4</version>
 	<lastchange/>
 	<system>
 		<optimization>normal</optimization>
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index fa4d5dc5e1..221df9e2fb 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -99,7 +99,7 @@ $g = array(
 	"disablecrashreporter" => false,
 	"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
 	"debug" => false,
-	"latest_config" => "15.3",
+	"latest_config" => "15.4",
 	"nopkg_platforms" => array("cdrom"),
 	"minimum_ram_warning" => "101",
 	"minimum_ram_warning_text" => "128 MB",
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 2a529792e8..df90e9aaa2 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4978,4 +4978,17 @@ function upgrade_152_to_153() {
 		}
 	}
 }
+function upgrade_153_to_154() {
+	global $config;
+
+	// rename packages from 2.1.x
+	$rename_arr = array("Quagga OSPF" => "Quagga_OSPF", "System Patches" => "System_Patches");
+	if (is_array($config['installedpackages']['package'])) {
+		foreach ($config['installedpackages']['package'] as $idx => $pkg) {
+			if (key_exists($pkg['name'], $rename_arr)) {
+				$config['installedpackages']['package'][$idx]['name'] == $rename_arr[$pkg['name']];
+			}
+		}
+	}
+}
 ?>