diff --git a/Makefile b/Makefile
index 276da9948..629038199 100644
--- a/Makefile
+++ b/Makefile
@@ -199,6 +199,9 @@ CORE_DEPENDS?=		ca_root_nss \
 CORE_CONFLICTS+=	${CONFLICT}-devel
 .endfor
 
+# assume conflicts are just for plugins
+CORE_CONFLICTS:=	${CORE_CONFLICTS:S/^/os-/g:O}
+
 WRKDIR?=${.CURDIR}/work
 WRKSRC?=${WRKDIR}/src
 PKGDIR?=${WRKDIR}/pkg
diff --git a/src/opnsense/scripts/firmware/register.php b/src/opnsense/scripts/firmware/register.php
index deb18bf9e..5e5e48bca 100755
--- a/src/opnsense/scripts/firmware/register.php
+++ b/src/opnsense/scripts/firmware/register.php
@@ -112,7 +112,7 @@ function plugins_disk_get()
         }
 
         if (!empty($ret['product_conflicts'])) {
-            foreach (explode(' ', $ret['product_conflicts']) as $conflict) {
+            foreach (preg_split('/\s+/', $ret['product_conflicts']) as $conflict) {
                 $obsolete[$conflict] = "I'm not even here";
             }
         }