diff --git a/Makefile b/Makefile
index 273638548..67cdef2b5 100644
--- a/Makefile
+++ b/Makefile
@@ -52,16 +52,20 @@ CORE_REPOSITORY?=	${CORE_ABI}/libressl
 CORE_REPOSITORY?=	${FLAVOUR}
 .endif
 
-CORE_NAME?=		opnsense-devel
-CORE_TYPE?=		development
-CORE_MESSAGE?=		Insert Name Here
-
+CORE_COMMENT?=		${CORE_PRODUCT} ${CORE_TYPE} package
 CORE_MAINTAINER?=	project@opnsense.org
-CORE_PACKAGESITE?=	https://pkg.opnsense.org
+CORE_MESSAGE?=		Insert Name Here
+CORE_NAME?=		opnsense-devel
 CORE_ORIGIN?=		opnsense/${CORE_NAME}
-CORE_COMMENT?=		OPNsense ${CORE_TYPE} package
+CORE_PACKAGESITE?=	https://pkg.opnsense.org
+CORE_PRODUCT?=		OPNsense
+CORE_TYPE?=		development
 CORE_WWW?=		https://opnsense.org/
 
+CORE_COPYRIGHT_HOLDER?=	Deciso B.V.
+CORE_COPYRIGHT_WWW?=	https://www.deciso.com/
+CORE_COPYRIGHT_YEARS?=	2014-2018
+
 CORE_DEPENDS_amd64?=	beep bsdinstaller
 CORE_DEPENDS_i386?=	${CORE_DEPENDS_amd64}
 
@@ -213,11 +217,7 @@ scripts:
 
 install:
 	@${MAKE} -C ${.CURDIR}/contrib install DESTDIR=${DESTDIR}
-	@${MAKE} -C ${.CURDIR}/src install DESTDIR=${DESTDIR} \
-	    CORE_NAME=${CORE_NAME} CORE_ABI=${CORE_ABI} CORE_WWW=${CORE_WWW} \
-	    CORE_MAINTAINER=${CORE_MAINTAINER} CORE_HASH=${CORE_HASH} \
-	    CORE_PACKAGESITE=${CORE_PACKAGESITE} \
-	    CORE_REPOSITORY=${CORE_REPOSITORY}
+	@${MAKE} -C ${.CURDIR}/src install DESTDIR=${DESTDIR} ${MAKE_REPLACE}
 
 collect:
 	@(cd ${.CURDIR}/src; find * -type f) | while read FILE; do \
@@ -229,11 +229,7 @@ collect:
 
 bootstrap:
 	@${MAKE} -C ${.CURDIR}/src install-bootstrap DESTDIR=${DESTDIR} \
-	    NO_SAMPLE=please CORE_PACKAGESITE=${CORE_PACKAGESITE} \
-	    CORE_NAME=${CORE_NAME} CORE_ABI=${CORE_ABI} CORE_WWW=${CORE_WWW} \
-	    CORE_MAINTAINER=${CORE_MAINTAINER} CORE_HASH=${CORE_HASH} \
-	    CORE_PACKAGESITE=${CORE_PACKAGESITE} \
-	    CORE_REPOSITORY=${CORE_REPOSITORY}
+	    NO_SAMPLE=please ${MAKE_REPLACE}
 
 plist:
 	@(${MAKE} -C ${.CURDIR}/contrib plist && \
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 66a326751..710f32af7 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2016-2018 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,3 +31,23 @@ OPENSSL?=	${LOCALBASE}/bin/openssl
 PKG!=		which pkg || echo true
 GIT!=		which git || echo true
 ARCH!=		uname -p
+
+REPLACEMENTS=	CORE_ABI \
+		CORE_COPYRIGHT_HOLDER \
+		CORE_COPYRIGHT_WWW \
+		CORE_COPYRIGHT_YEARS \
+		CORE_HASH \
+		CORE_MAINTAINER \
+		CORE_NAME \
+		CORE_PACKAGESITE \
+		CORE_PRODUCT \
+		CORE_REPOSITORY \
+		CORE_WWW
+
+MAKE_REPLACE=	# empty
+SED_REPLACE=	# empty
+
+.for REPLACEMENT in ${REPLACEMENTS}
+MAKE_REPLACE+=	${REPLACEMENT}="${${REPLACEMENT}}"
+SED_REPLACE+=	-e "s=%%${REPLACEMENT}%%=${${REPLACEMENT}}=g"
+.endfor
diff --git a/Mk/tree.mk b/Mk/tree.mk
index 05de6c90a..1f77a97b9 100644
--- a/Mk/tree.mk
+++ b/Mk/tree.mk
@@ -55,14 +55,7 @@ install-${TARGET}:
 	cp -vr ${TREE} ${DESTDIR}${ROOT_${TARGET}}$${REALTARGET}
 	@(cd ${TREE}; find * -type f ${_IGNORES}) | while read FILE; do \
 		if [ "$${FILE%%.in}" != "$${FILE}" ]; then \
-			sed -i '' \
-			    -e "s=%%CORE_ABI%%=${CORE_ABI}=g" \
-			    -e "s=%%CORE_HASH%%=${CORE_HASH}=g" \
-			    -e "s=%%CORE_MAINTAINER%%=${CORE_MAINTAINER}=g" \
-			    -e "s=%%CORE_NAME%%=${CORE_NAME}=g" \
-			    -e "s=%%CORE_PACKAGESITE%%=${CORE_PACKAGESITE}=g" \
-			    -e "s=%%CORE_REPOSITORY%%=${CORE_REPOSITORY}=g" \
-			    -e "s=%%CORE_WWW%%=${CORE_WWW}=g" \
+			sed -i '' ${SED_REPLACE} \
 			    "${DESTDIR}${ROOT_${TARGET}}/${TREE}/$${FILE}"; \
 			mv -v "${DESTDIR}${ROOT_${TARGET}}/${TREE}/$${FILE}" \
 			    "${DESTDIR}${ROOT_${TARGET}}/${TREE}/$${FILE%%.in}"; \
diff --git a/src/opnsense/firmware-product.in b/src/opnsense/firmware-product.in
index b2344dbb8..3239d3e84 100644
--- a/src/opnsense/firmware-product.in
+++ b/src/opnsense/firmware-product.in
@@ -1,10 +1,10 @@
 {
-    "product_copyright_owner": "Deciso B.V.",
-    "product_copyright_url": "https://www.deciso.com/",
-    "product_copyright_years": "2014-2018",
+    "product_copyright_owner": "%%CORE_COPYRIGHT_HOLDER%%",
+    "product_copyright_url": "%%CORE_COPYRIGHT_WWW%%",
+    "product_copyright_years": "%%CORE_COPYRIGHT_YEARS%%",
     "product_email": "%%CORE_MAINTAINER%%",
     "product_hash": "%%CORE_HASH%%",
-    "product_id": "opnsense",
-    "product_name": "OPNsense",
+    "product_id": "%%CORE_NAME%%",
+    "product_name": "%%CORE_PRODUCT%%",
     "product_website": "%%CORE_WWW%%"
 }