diff --git a/Makefile b/Makefile
index 5f70127fb7..a11c545146 100644
--- a/Makefile
+++ b/Makefile
@@ -94,10 +94,6 @@ CORE_VERSION?=	${CORE_COMMIT:[1]}
 CORE_REVISION?=	${CORE_COMMIT:[2]}
 CORE_HASH?=	${CORE_COMMIT:[3]}
 
-CORE_MAINS=	master main
-CORE_MAIN?=	${CORE_MAINS:[1]}
-CORE_STABLE?=	stable/${CORE_ABI}
-
 _CORE_SERIES=	${CORE_VERSION:S/./ /g}
 CORE_SERIES?=	${_CORE_SERIES:[1]}.${_CORE_SERIES:[2]}
 .if empty(CORE_SPACER)
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 2ac0754e77..dada2e2cd2 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -109,3 +109,7 @@ MFCDIR?=	/tmp/mfc.dir
 PKGDIR?=	${WRKDIR}/pkg
 WRKSRC?=	${WRKDIR}/src
 TESTDIR?=	${.CURDIR}/src/opnsense/mvc/tests
+
+CORE_MAINS=	master main
+CORE_MAIN?=	${CORE_MAINS:[1]}
+CORE_STABLE?=	stable/${CORE_ABI}