diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index 2499788cd..76b64ea4a 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -103,7 +103,15 @@ scripts-manual:
 	done
 
 scripts-auto:
-	# XXX ticket #35
+	@if [ -d ${.CURDIR}/src/etc/rc.syshook.d ]; then \
+		for SYSHOOK in early start; do \
+			for FILE in $$(cd ${.CURDIR}/src/etc/rc.syshook.d && \
+			    find -s . -type f -name "*.$${SYSHOOK}"); do \
+				echo ${LOCALBASE}/etc/rc.syshook.d/$${FILE#./} >> \
+				    ${DESTDIR}/+POST_INSTALL; \
+			done; \
+		done; \
+	fi
 	@if [ -d ${.CURDIR}/src/opnsense/service/conf/actions.d ]; then \
 		for SCRIPT in +POST_INSTALL +POST_DEINSTALL; do \
 			cat ${TEMPLATESDIR}/actions.d >> \
diff --git a/sysutils/vmware/+POST_INSTALL b/sysutils/vmware/+POST_INSTALL
deleted file mode 100644
index 91d6da64f..000000000
--- a/sysutils/vmware/+POST_INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/local/etc/rc.syshook.d/50-vmware.early
-/usr/local/etc/rc.syshook.d/50-vmware.start
diff --git a/sysutils/xen/+POST_INSTALL b/sysutils/xen/+POST_INSTALL
deleted file mode 100644
index b2ef911d6..000000000
--- a/sysutils/xen/+POST_INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/etc/rc.syshook.d/50-xen.start