diff --git a/Makefile b/Makefile
index 1bc7ac627..a83093928 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,9 @@ CORE_PYTHON?=	37
 
 .if exists(${GIT}) && exists(${GITVERSION})
 . if ${CORE_ABI} == "21.1"
-CORE_COMMIT!=	${GITVERSION} --exclude=21.7.r\*
+CORE_COMMIT!=	${GITVERSION} --match=21.7\*
 . elif ${CORE_ABI} == "20.7"
-CORE_COMMIT!=	${GITVERSION} --exclude=21.1.r\*
+CORE_COMMIT!=	${GITVERSION} --match=21.1.b
 . else
 CORE_COMMIT!=	${GITVERSION}
 . endif