diff --git a/Makefile b/Makefile
index a83093928..2e5c489fd 100644
--- a/Makefile
+++ b/Makefile
@@ -32,13 +32,25 @@ CORE_ABI?=	21.1
 CORE_PHP?=	73
 CORE_PYTHON?=	37
 
-.if exists(${GIT}) && exists(${GITVERSION})
-. if ${CORE_ABI} == "21.1"
-CORE_COMMIT!=	${GITVERSION} --match=21.7\*
-. elif ${CORE_ABI} == "20.7"
-CORE_COMMIT!=	${GITVERSION} --match=21.1.b
-. else
-CORE_COMMIT!=	${GITVERSION}
+_CORE_NEXT=	${CORE_ABI:C/\./ /}
+.if ${_CORE_NEXT:[2]} == 7
+CORE_NEXT!=	expr ${_CORE_NEXT:[1]} + 1
+CORE_NEXT:=	${CORE_NEXT}.1
+.else
+CORE_NEXT=	${_CORE_NEXT:[1]}
+CORE_NEXT:=	${CORE_NEXT}.7
+.endif
+
+.if exists(${GIT})
+. if exists(${GITVERSION})
+_NEXTBETA!=	${GIT} tag -l ${CORE_NEXT}.b
+_NEXTDEVEL!=	${GIT} tag -l ${CORE_NEXT}\*
+.  if !empty(_NEXTBETA)
+_NEXTMATCH=	--match=${CORE_NEXT}.b
+.  elif !empt(_NEXTDEVEL)
+_NEXTMATCH=	--match=${CORE_NEXT}\*
+.  endif
+CORE_COMMIT!=	${GITVERSION} ${_NEXTMATCH}
 . endif
 .else
 CORE_COMMIT=	unknown 0 undefined
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 10bd56569..31fce7be0 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -85,6 +85,7 @@ REPLACEMENTS=	CORE_ABI \
 		CORE_HASH \
 		CORE_MAINTAINER \
 		CORE_NAME \
+		CORE_NEXT \
 		CORE_PACKAGESITE \
 		CORE_PKGVERSION \
 		CORE_PRODUCT \
diff --git a/src/root/boot/logo-hourglass.4th b/src/root/boot/logo-hourglass.4th.in
similarity index 97%
rename from src/root/boot/logo-hourglass.4th
rename to src/root/boot/logo-hourglass.4th.in
index 54fd518bf..852d0a3a9 100644
--- a/src/root/boot/logo-hourglass.4th
+++ b/src/root/boot/logo-hourglass.4th.in
@@ -50,7 +50,7 @@
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@  " logo+
 	s"  #[m                              " logo+
-	s"    21.7  ``The Road Ahead''   #[m" logo+
+	s"    %%CORE_NEXT%%  ``The Road Ahead''   #[m" logo+
 
 	2drop
 ;