diff --git a/cddl/Makefile b/cddl/Makefile
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -3,7 +3,7 @@
 .include <src.opts.mk>
 
 SUBDIR=	lib .WAIT \
-	sbin share usr.bin usr.sbin
+	sbin share usr.bin usr.libexec usr.sbin
 
 SUBDIR.${MK_TESTS}+= tests
 
diff --git a/cddl/usr.libexec/Makefile b/cddl/usr.libexec/Makefile
new file mode 100644
--- /dev/null
+++ b/cddl/usr.libexec/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+SUBDIR=	${_zpool_influxdb}
+
+.if ${MK_ZFS} != "no"
+_zpool_influxdb= zpool_influxdb
+.endif
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile
new file mode 100644
--- /dev/null
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
+
+.PATH: ${ZFSTOP}/cmd/zpool_influxdb
+.PATH: ${ZFSTOP}/man/man8
+
+PROG=	zpool_influxdb
+MAN=	zpool_influxdb.8
+BINDIR?=	/usr/libexec/zfs
+
+WARNS?=	0
+CSTD=	c99
+
+CFLAGS+= \
+	-DIN_BASE \
+	-I${ZFSTOP}/include \
+	-I${ZFSTOP}/lib/libspl/include \
+	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
+	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
+	-DHAVE_ISSETUGID \
+	-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
+	-DSYSCONFDIR=\"/etc\" \
+	-DPKGDATADIR=\"/usr/share/zfs\"
+
+LIBADD=	nvpair spl zfs
+
+.include <bsd.prog.mk>
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile.depend b/cddl/usr.libexec/zpool_influxdb/Makefile.depend
new file mode 100644
--- /dev/null
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile.depend
@@ -0,0 +1,31 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	cddl/lib/libavl \
+	cddl/lib/libnvpair \
+	cddl/lib/libumem \
+	cddl/lib/libuutil \
+	cddl/lib/libzfs \
+	cddl/lib/libzfs_core \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libexpat \
+	lib/libgeom \
+	lib/libmd \
+	lib/libsbuf \
+	lib/libthr \
+	lib/libutil \
+	lib/libz \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -54,6 +54,8 @@
                 ..
                 sm.bin
                 ..
+                zfs
+                ..
             ..
             sbin
             ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -156,6 +156,8 @@
         ..
         sm.bin
         ..
+        zfs
+        ..
     ..
     local
     ..