diff --git a/+POST_INSTALL b/+POST_INSTALL
index 1d1edfb35..a5aafa85a 100644
--- a/+POST_INSTALL
+++ b/+POST_INSTALL
@@ -31,10 +31,6 @@ EOF
 cat /etc/rc.shutdown.bak >> /etc/rc.shutdown
 rm -f /etc/rc.shutdown.bak
 
-# 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
-
 /usr/local/etc/rc.d/configd start
 
 /usr/local/etc/rc.configure_firmware
diff --git a/Makefile b/Makefile
index 716cb22c6..47eb7e2eb 100644
--- a/Makefile
+++ b/Makefile
@@ -155,6 +155,10 @@ mount:
 	    echo -n "Enabling core.git live mount..."; \
 	    sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/version/opnsense.in > \
 	        ${.CURDIR}/src/opnsense/version/opnsense; \
+	    sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/version/opnsense.abi.in > \
+	        ${.CURDIR}/src/opnsense/version/opnsense.abi; \
+	    sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/version/opnsense.name.in > \
+	        ${.CURDIR}/src/opnsense/version/opnsense.name; \
 	    mount_unionfs ${.CURDIR}/src ${LOCALBASE}; \
 	    touch ${WRKDIR}/.mount_done; \
 	    echo "done"; \
diff --git a/plist b/plist
index e95cefc59..9fae457a2 100644
--- a/plist
+++ b/plist
@@ -839,6 +839,8 @@
 /usr/local/opnsense/site-python/watchers/__init__.py
 /usr/local/opnsense/site-python/watchers/dhcpd.py
 /usr/local/opnsense/version/opnsense
+/usr/local/opnsense/version/opnsense.abi
+/usr/local/opnsense/version/opnsense.name
 /usr/local/opnsense/www/api.php
 /usr/local/opnsense/www/css/bootstrap-datepicker3.min.css
 /usr/local/opnsense/www/css/flags/1x1/ad.svg
diff --git a/src/opnsense/version/.gitignore b/src/opnsense/version/.gitignore
index ade160aec..adde9fc76 100644
--- a/src/opnsense/version/.gitignore
+++ b/src/opnsense/version/.gitignore
@@ -1,2 +1,4 @@
 *
+!/opnsense.abi.in
 !/opnsense.in
+!/opnsense.name.in
diff --git a/src/opnsense/version/opnsense.abi.in b/src/opnsense/version/opnsense.abi.in
new file mode 100644
index 000000000..9cf66b1b4
--- /dev/null
+++ b/src/opnsense/version/opnsense.abi.in
@@ -0,0 +1 @@
+%%CORE_ABI%%
diff --git a/src/opnsense/version/opnsense.name.in b/src/opnsense/version/opnsense.name.in
new file mode 100644
index 000000000..568dfbe94
--- /dev/null
+++ b/src/opnsense/version/opnsense.name.in
@@ -0,0 +1 @@
+%%CORE_NAME%%