diff --git a/Makefile b/Makefile
index 6b22f54aa..99914e38f 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,9 @@ _NEXTBETA!=	${GIT} tag -l ${CORE_NEXT}.b
 .  if !empty(_NEXTBETA)
 _NEXTMATCH=	--match=${CORE_NEXT}.b
 .  else
-_NEXTDEVEL!=	${GIT} tag -l ${CORE_NEXT}\*
+_NEXTDEVEL!=	${GIT} tag -l ${CORE_ABI}\*
 .   if !empty(_NEXTDEVEL)
-_NEXTMATCH=	--match=${CORE_NEXT}\*
+_NEXTMATCH=	--match=${CORE_ABI}\*
 .   endif
 .  endif
 . elif ${CORE_TYPE:M[Bb][Uu][Ss]*}
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 6f35c6c48..9c4e1190e 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_NICKNAME \
 		CORE_PACKAGESITE \
 		CORE_PKGVERSION \