diff --git a/Makefile b/Makefile
index 2b125940e..156c52b8c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,16 @@ all:
 .include "Mk/defaults.mk"
 
 CORE_COMMIT!=	${.CURDIR}/Scripts/version.sh
-CORE_VERSION=	${CORE_COMMIT:C/-.*$//1}
-CORE_HASH=	${CORE_COMMIT:C/^.*-//1}
+
+CORE_VERSION?=	${CORE_COMMIT:[1]}
+CORE_REVISION?=	${CORE_COMMIT:[2]}
+CORE_HASH?=	${CORE_COMMIT:[3]}
+
+.if "${CORE_REVISION}" != "" && "${CORE_REVISION}" != "0"
+CORE_PKGVER=	${CORE_VERSION}_${CORE_REVISION}
+.else
+CORE_PKGVER=	${CORE_VERSION}
+.endif
 
 CORE_ABI?=	18.7
 CORE_ARCH?=	${ARCH}
@@ -173,7 +181,7 @@ umount:
 
 manifest:
 	@echo "name: \"${CORE_NAME}\""
-	@echo "version: \"${CORE_VERSION}\""
+	@echo "version: \"${CORE_PKGVER}\""
 	@echo "origin: \"${CORE_ORIGIN}\""
 	@echo "comment: \"${CORE_COMMENT}\""
 	@echo "desc: \"${CORE_HASH}\""
@@ -263,13 +271,13 @@ package: plist-check package-check clean-work
 .for CORE_DEPEND in ${CORE_DEPENDS}
 	@if ! ${PKG} info ${CORE_DEPEND} > /dev/null; then ${PKG} install -yfA ${CORE_DEPEND}; fi
 .endfor
-	@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_VERSION}..."
+	@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_PKGVER}..."
 	@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} metadata
 	@echo " done"
-	@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_VERSION}..."
+	@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_PKGVER}..."
 	@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install
 	@echo " done"
-	@echo ">>> Packaging files for ${CORE_NAME}-${CORE_VERSION}:"
+	@echo ">>> Packaging files for ${CORE_NAME}-${CORE_PKGVER}:"
 	@PORTSDIR=${.CURDIR} ${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \
 	    -p ${WRKSRC}/plist -o ${PKGDIR}
 
@@ -373,8 +381,8 @@ mfc:
 	@git checkout master
 
 test: want-phpunit6-php${CORE_PHP}
-	@if [ "$$(${PKG} query %n-%v ${CORE_NAME})" != "${CORE_NAME}-${CORE_VERSION}" ]; then \
-		echo "Installed version does not match, expected ${CORE_NAME}-${CORE_VERSION}"; \
+	@if [ "$$(${PKG} query %n-%v ${CORE_NAME})" != "${CORE_NAME}-${CORE_PKGVER}" ]; then \
+		echo "Installed version does not match, expected ${CORE_NAME}-${CORE_PKGVER}"; \
 		exit 1; \
 	fi
 	@cd ${.CURDIR}/src/opnsense/mvc/tests && \
diff --git a/Scripts/version.sh b/Scripts/version.sh
index 156b93d26..3258078fe 100755
--- a/Scripts/version.sh
+++ b/Scripts/version.sh
@@ -29,10 +29,6 @@ set -e
 
 VERSION=$(git describe --abbrev=0 --always)
 REVISION=$(git rev-list ${VERSION}.. --count)
-COMMENT=$(git rev-list HEAD --max-count=1 | cut -c1-9)
-if [ "${REVISION}" != "0" ]; then
-	# must construct full version string manually
-	VERSION=${VERSION}_${REVISION}
-fi
+HASH=$(git rev-list HEAD --max-count=1 | cut -c1-9)
 
-echo ${VERSION}-${COMMENT}
+echo ${VERSION} ${REVISION} ${HASH}