diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index b1fcb8eb194a..4112e8a94b59 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -2,7 +2,12 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=	${_ztest}
+SUBDIR= \
+	ctfconvert \
+	ctfdump \
+	ctfmerge \
+	sgsmsg \
+	${_ztest}
 
 .if ${MK_ZFS} != "no"
 .if ${MK_LIBTHR} != "no"
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
new file mode 100644
index 000000000000..57a08dd04c6d
--- /dev/null
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -0,0 +1,51 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+.include	"../../Makefile.inc"
+
+DEBUG_FLAGS=	-g
+
+PROG=		ctfconvert
+
+SRCS=		alist.c \
+		ctf.c \
+		ctfconvert.c \
+		dwarf.c \
+		fixup_tdescs.c \
+		hash.c \
+		iidesc.c \
+		input.c \
+		list.c \
+		memory.c \
+		merge.c \
+		output.c \
+		st_parse.c \
+		stabs.c \
+		stack.c \
+		strtab.c \
+		symbol.c \
+		tdata.c \
+		traverse.c \
+		util.c
+
+WARNS?=		6
+
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
+		-I${OPENSOLARIS_USR_DISTDIR} \
+		-I${OPENSOLARIS_SYS_DISTDIR} \
+		-I${OPENSOLARIS_USR_DISTDIR}/head \
+		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
+		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
+		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+
+LDADD+=		-lctf -ldwarf -lelf -lz -lthr
+
+.PATH:		${.CURDIR}
+.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
+.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
+
+MK_MAN=		no
+
+.include <bsd.prog.mk>
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
new file mode 100644
index 000000000000..9a65c15efd31
--- /dev/null
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+.include	"../../Makefile.inc"
+
+PROG=		ctfdump
+
+SRCS=		dump.c \
+		symbol.c \
+		utils.c
+
+WARNS?=		6
+
+CFLAGS+=	-I${OPENSOLARIS_USR_DISTDIR} \
+		-I${OPENSOLARIS_SYS_DISTDIR} \
+		-I${OPENSOLARIS_USR_DISTDIR}/head \
+		-I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \
+		-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
+		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
+		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+
+LDFLAGS+=	-pthread
+
+LDADD+=		-lelf -lz
+
+.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
+.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump
+
+NO_MAN=
+
+.include <bsd.prog.mk>
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
new file mode 100644
index 000000000000..051fa0b434d3
--- /dev/null
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+.include	"../../Makefile.inc"
+
+WARNS=		1
+
+PROG=		ctfmerge
+
+SRCS=		alist.c \
+		barrier.c \
+		ctf.c \
+		ctfmerge.c \
+		fifo.c \
+		hash.c \
+		iidesc.c \
+		input.c \
+		list.c \
+		memory.c \
+		merge.c \
+		output.c \
+		strtab.c \
+		symbol.c \
+		tdata.c \
+		traverse.c \
+		util.c
+
+WARNS?=		6
+
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
+		-I${OPENSOLARIS_USR_DISTDIR} \
+		-I${OPENSOLARIS_SYS_DISTDIR} \
+		-I${OPENSOLARIS_USR_DISTDIR}/head \
+		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
+		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
+		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+
+LDADD+=		-lctf -ldwarf -lelf -lz -lthr
+
+.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
+.PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
+
+MK_MAN=		no
+
+.include <bsd.prog.mk>
diff --git a/cddl/usr.bin/sgsmsg/Makefile b/cddl/usr.bin/sgsmsg/Makefile
new file mode 100644
index 000000000000..541441481dda
--- /dev/null
+++ b/cddl/usr.bin/sgsmsg/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.include	"../../Makefile.inc"
+
+# This program is required as a bootstrap tool for 'make buildworld'
+PROG=		sgsmsg
+
+SRCS=		avl.c sgsmsg.c string_table.c findprime.c
+
+CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
+		-I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \
+		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+
+.PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common
+.PATH:		${OPENSOLARIS_SYS_DISTDIR}/common/avl
+
+NO_MAN=
+
+.include <bsd.prog.mk>