diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index 823fd4ea7..cd89650d2 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -131,8 +131,8 @@ manifest: check
 	done
 	@echo "}"
 .endif
-	@if [ -f ${WRKSRC}/usr/local/opnsense/version/${PLUGIN_NAME} ]; then \
-	    echo "annotations $$(cat ${WRKSRC}/usr/local/opnsense/version/${PLUGIN_NAME})"; \
+	@if [ -f ${WRKSRC}${LOCALBASE}/opnsense/version/${PLUGIN_NAME} ]; then \
+	    echo "annotations $$(cat ${WRKSRC}${LOCALBASE}/opnsense/version/${PLUGIN_NAME})"; \
 	fi
 
 scripts: check scripts-pre scripts-auto scripts-manual scripts-post
@@ -185,6 +185,12 @@ scripts-auto:
 			    ${DESTDIR}/+POST_INSTALL; \
 		done; \
 	fi
+	@if [ -d ${.CURDIR}/src/opnsense/scripts/firmware/repos ]; then \
+		for FILE in $$(cd ${.CURDIR}/src && find -s \
+		    opnsense/scripts/firmware/repos -type f); do \
+			echo "${LOCALBASE}/$${FILE#.}" >> ${DESTDIR}/+POST_INSTALL; \
+		done \
+	fi
 
 scripts-manual:
 	@for SCRIPT in ${PLUGIN_SCRIPTS}; do \
@@ -273,7 +279,7 @@ package: check
 	@${MAKE} DESTDIR=${WRKSRC} install
 	@echo " done"
 	@echo ">>> Generated version info for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}:"
-	@cat ${WRKSRC}/usr/local/opnsense/version/${PLUGIN_NAME}
+	@cat ${WRKSRC}${LOCALBASE}/opnsense/version/${PLUGIN_NAME}
 	@echo -n ">>> Generating metadata for ${PLUGIN_PKGNAME}-${PLUGIN_PKGVERSION}..."
 	@${MAKE} DESTDIR=${WRKSRC} metadata
 	@echo " done"
@@ -434,7 +440,7 @@ style-model:
 
 test: check
 	@if [ -d ${.CURDIR}/src/opnsense/mvc/tests ]; then \
-		cd /usr/local/opnsense/mvc/tests && \
+		cd ${LOCALBASE}/opnsense/mvc/tests && \
 		    phpunit --configuration PHPunit.xml \
 		    ${.CURDIR}/src/opnsense/mvc/tests; \
 	fi