diff --git a/+POST_INSTALL b/+POST_INSTALL
index 6a42d2914a..1d1edfb355 100644
--- a/+POST_INSTALL
+++ b/+POST_INSTALL
@@ -31,7 +31,7 @@ EOF
 cat /etc/rc.shutdown.bak >> /etc/rc.shutdown
 rm -f /etc/rc.shutdown.bak
 
-# XXX 18.7 compat for now
+# XXX 18.7 compat for now (remove scripts SED_REPLACE from Makefile, too)
 echo "%%CORE_NAME%%" > /usr/local/opnsense/version/opnsense.name
 echo "%%CORE_ABI%%" > /usr/local/opnsense/version/opnsense.abi
 
diff --git a/Makefile b/Makefile
index dabe66337e..f7467bcb90 100644
--- a/Makefile
+++ b/Makefile
@@ -209,10 +209,7 @@ scripts:
 .for PKG_SCRIPT in ${PKG_SCRIPTS}
 	@if [ -e ${.CURDIR}/${PKG_SCRIPT} ]; then \
 		cp -v -- ${.CURDIR}/${PKG_SCRIPT} ${DESTDIR}/; \
-		sed -i '' -e "s/%%CORE_COMMIT%%/${CORE_COMMIT}/g" \
-		    -e "s/%%CORE_NAME%%/${CORE_NAME}/g" \
-		    -e "s/%%CORE_ABI%%/${CORE_ABI}/g" \
-		    ${DESTDIR}/${PKG_SCRIPT}; \
+		sed -i '' ${SED_REPLACE} ${DESTDIR}/${PKG_SCRIPT}; \
 	fi
 .endfor