diff --git a/release/packages/bsnmp-debug-lib32.ucl b/release/packages/bsnmp-lib32-debug.ucl
similarity index 100%
rename from release/packages/bsnmp-debug-lib32.ucl
rename to release/packages/bsnmp-lib32-debug.ucl
diff --git a/release/packages/jail-debug-lib32.ucl b/release/packages/jail-lib32-debug.ucl
similarity index 100%
rename from release/packages/jail-debug-lib32.ucl
rename to release/packages/jail-lib32-debug.ucl
diff --git a/release/packages/debug-lib32.ucl b/release/packages/lib32-debug.ucl
similarity index 100%
rename from release/packages/debug-lib32.ucl
rename to release/packages/lib32-debug.ucl
diff --git a/release/packages/ssh-debug-lib32.ucl b/release/packages/ssh-lib32-debug.ucl
similarity index 100%
rename from release/packages/ssh-debug-lib32.ucl
rename to release/packages/ssh-lib32-debug.ucl
diff --git a/release/packages/unbound-debug-lib32.ucl b/release/packages/unbound-lib32-debug.ucl
similarity index 100%
rename from release/packages/unbound-debug-lib32.ucl
rename to release/packages/unbound-lib32-debug.ucl
diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk
index a60a62416741..51dea0df8629 100644
--- a/release/scripts/mtree-to-plist.awk
+++ b/release/scripts/mtree-to-plist.awk
@@ -39,7 +39,7 @@
 				gsub(/package=/, "", pkgname)
 			} else if (a[i] == "config") {
 				type="config"
-			} else if (a[i] == "development" || a[i] == "profile") {
+			} else if (a[i] == "development" || a[i] == "profile" || a[i] == "debug") {
 				pkgend=a[i]
 			} else {
 				if (ext != "")