4 files changed, 24 insertions, 8 deletions
diff --git a/cddl/usr.libexec/Makefile b/cddl/usr.libexec/Makefile
index 6280cbab5766..9eb4872b69d5 100644
--- a/cddl/usr.libexec/Makefile
+++ b/cddl/usr.libexec/Makefile
@@ -1,12 +1,9 @@
-# $FreeBSD$
 
 .include <src.opts.mk>
 
-SUBDIR=	${_zpool_influxdb}
-
-.if ${MK_ZFS} != "no"
-_zpool_influxdb= zpool_influxdb
-.endif
+SUBDIR.${MK_ZFS}+= \
+	zfs_prepare_disk \
+	zpool_influxdb
 
 SUBDIR_PARALLEL=
 
diff --git a/cddl/usr.libexec/zfs_prepare_disk/Makefile b/cddl/usr.libexec/zfs_prepare_disk/Makefile
new file mode 100644
index 000000000000..e75484c6dc59
--- /dev/null
+++ b/cddl/usr.libexec/zfs_prepare_disk/Makefile
@@ -0,0 +1,20 @@
+
+ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
+
+.PATH: ${ZFSTOP}/scripts
+
+PACKAGE=	zfs
+SCRIPTS=	zfs_prepare_disk 
+SCRIPTSDIR=	${LIBEXECDIR}/zfs
+
+.PATH: ${ZFSTOP}/man/man8
+MAN=		zfs_prepare_disk.8
+
+CLEANFILES+=	zfs_prepare_disk.8
+
+zfs_prepare_disk.8: zfs_prepare_disk.8.in
+	sed ${MAN_SUB} ${.ALLSRC} >${.TARGET}
+
+MAN_SUB+= -e 's|@zfsexecdir@|${LIBEXECDIR}/zfs|g'
+
+.include <bsd.prog.mk>
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile
index 2fb22f02ef32..bd50df9e3c4c 100644
--- a/cddl/usr.libexec/zpool_influxdb/Makefile
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile
@@ -1,10 +1,10 @@
-# $FreeBSD$
 
 ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
 
 .PATH: ${ZFSTOP}/cmd/zpool_influxdb
 .PATH: ${ZFSTOP}/man/man8
 
+PACKAGE=zfs
 PROG=	zpool_influxdb
 MAN=	zpool_influxdb.8
 BINDIR?=	/usr/libexec/zfs
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile.depend b/cddl/usr.libexec/zpool_influxdb/Makefile.depend
index 53090da6e2fc..50b043094969 100644
--- a/cddl/usr.libexec/zpool_influxdb/Makefile.depend
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \