diff --git a/Makefile b/Makefile
index 7a6f06705..9eac5b899 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ CORE_TYPE?=	development
 . if empty(CORE_${REPLACEMENT})
 .  warning Cannot build without CORE_${REPLACEMENT} set
 . endif
+CORE_MAKE+=	CORE_${REPLACEMENT}=${CORE_${REPLACEMENT}}
 .endfor
 
 _CORE_NEXT=	${CORE_ABI:C/\./ /}
@@ -260,8 +261,8 @@ scripts:
 .endfor
 
 install:
-	@${MAKE} -C ${.CURDIR}/contrib install DESTDIR=${DESTDIR}
-	@${MAKE} -C ${.CURDIR}/src install DESTDIR=${DESTDIR} ${MAKE_REPLACE}
+	@${CORE_MAKE} -C ${.CURDIR}/contrib install DESTDIR=${DESTDIR}
+	@${CORE_MAKE} -C ${.CURDIR}/src install DESTDIR=${DESTDIR} ${MAKE_REPLACE}
 .if exists(${LOCALBASE}/opnsense/www/index.php)
 	# try to update the current system if it looks like one
 	@touch ${LOCALBASE}/opnsense/www/index.php
@@ -276,19 +277,19 @@ collect:
 	done
 
 bootstrap:
-	@${MAKE} -C ${.CURDIR}/src install-bootstrap DESTDIR=${DESTDIR} \
+	@${CORE_MAKE} -C ${.CURDIR}/src install-bootstrap DESTDIR=${DESTDIR} \
 	    NO_SAMPLE=please ${MAKE_REPLACE}
 
 plist:
-	@(${MAKE} -C ${.CURDIR}/contrib plist && \
-	    ${MAKE} -C ${.CURDIR}/src plist) | sort
+	@(${CORE_MAKE} -C ${.CURDIR}/contrib plist && \
+	    ${CORE_MAKE} -C ${.CURDIR}/src plist) | sort
 
 plist-fix:
-	@${MAKE} DESTDIR=${DESTDIR} plist > ${.CURDIR}/plist
+	@${CORE_MAKE} DESTDIR=${DESTDIR} plist > ${.CURDIR}/plist
 
 plist-check:
 	@mkdir -p ${WRKDIR}
-	@${MAKE} DESTDIR=${DESTDIR} plist > ${WRKDIR}/plist.new
+	@${CORE_MAKE} DESTDIR=${DESTDIR} plist > ${WRKDIR}/plist.new
 	@cat ${.CURDIR}/plist > ${WRKDIR}/plist.old
 	@if ! diff -q ${WRKDIR}/plist.old ${WRKDIR}/plist.new > /dev/null ; then \
 		diff -u ${WRKDIR}/plist.old ${WRKDIR}/plist.new || true; \
@@ -300,9 +301,9 @@ plist-check:
 
 metadata:
 	@mkdir -p ${DESTDIR}
-	@${MAKE} DESTDIR=${DESTDIR} scripts
-	@${MAKE} DESTDIR=${DESTDIR} manifest > ${DESTDIR}/+MANIFEST
-	@${MAKE} DESTDIR=${DESTDIR} plist > ${DESTDIR}/plist
+	@${CORE_MAKE} DESTDIR=${DESTDIR} scripts
+	@${CORE_MAKE} DESTDIR=${DESTDIR} manifest > ${DESTDIR}/+MANIFEST
+	@${CORE_MAKE} DESTDIR=${DESTDIR} plist > ${DESTDIR}/plist
 
 package-check:
 	@if [ -f ${WRKDIR}/.mount_done ]; then \
@@ -315,10 +316,10 @@ package: plist-check package-check clean-wrksrc
 	@if ! ${PKG} info ${CORE_DEPEND} > /dev/null; then ${PKG} install -yfA ${CORE_DEPEND}; fi
 .endfor
 	@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_PKGVERSION}..."
-	@${MAKE} DESTDIR=${WRKSRC} metadata
+	@${CORE_MAKE} DESTDIR=${WRKSRC} metadata
 	@echo " done"
 	@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_PKGVERSION}..."
-	@${MAKE} DESTDIR=${WRKSRC} install
+	@${CORE_MAKE} DESTDIR=${WRKSRC} install
 	@echo " done"
 	@echo ">>> Generated version info for ${CORE_NAME}-${CORE_PKGVERSION}:"
 	@cat ${WRKSRC}/usr/local/opnsense/version/core
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 19829f077..701fed049 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -37,6 +37,8 @@ GITVERSION=	${.CURDIR}/Scripts/version.sh
 _CORE_ARCH!=	uname -p
 CORE_ARCH?=	${_CORE_ARCH}
 
+CORE_MAKE=	${MAKE}
+
 OPENSSL=	${LOCALBASE}/bin/openssl
 
 .if ! defined(CORE_FLAVOUR)