diff --git a/usr.bin/gss/Makefile b/usr.bin/gss/Makefile
new file mode 100644
index 000000000000..c3214a278f48
--- /dev/null
+++ b/usr.bin/gss/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2008/03/22 09:24:06 mlelstv Exp $
+
+NOLINT= # defined
+
+.include <bsd.own.mk>
+
+DIST=		${NETBSDSRCDIR}/crypto/dist
+.PATH: ${DIST}/heimdal/lib/gssapi
+
+WARNS?=  1
+
+PROG= gss
+# no man page yet
+MAN=
+
+SRCS= \
+	gss.c				\
+	gss-commands.c
+
+CPPFLAGS+= -I.					\
+	-I${DIST}/heimdal/lib/gssapi		\
+	-I${NETBSDSRCDIR}/include/heimdal	\
+	-I${DESTDIR}/usr/include/krb5		\
+	-DHAVE_CONFIG_H
+
+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
+VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
+
+LDADD+=	-lgssapi -lsl -L${VERS} -lvers -lroken -lcrypt
+DPADD+=	${LIBGSSAPI} ${LIBSL} ${VERS}/libvers.a ${LIBROKEN} ${LIBCRYPT}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/hxtool/Makefile b/usr.bin/hxtool/Makefile
new file mode 100644
index 000000000000..2307dba9bba9
--- /dev/null
+++ b/usr.bin/hxtool/Makefile
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.1 2008/03/22 09:24:06 mlelstv Exp $
+
+NOLINT= # defined
+
+.include <bsd.own.mk>
+
+DIST=		${NETBSDSRCDIR}/crypto/dist
+.PATH: ${DIST}/heimdal/lib/hx509
+
+WARNS?=  1
+
+PROG= hxtool
+# man page is missing
+MAN=
+
+SRCS= \
+	hxtool.c				\
+	hxtool-commands.c
+
+CPPFLAGS+= -I.					\
+	-I${DIST}/heimdal/lib/hx509		\
+	-I${DIST}/heimdal/lib/asn1		\
+	-I${NETBSDSRCDIR}/include/heimdal	\
+	-I${DESTDIR}/usr/include/krb5		\
+	-DHAVE_CONFIG_H
+
+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
+VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
+
+LDADD+=	-lhx509 -lcrypto -lasn1 -lcom_err \
+	-L${VERS} -lvers -lroken -lsl -lcrypt
+DPADD+=	${LIBHX509} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} \
+	${VERS}/libvers.a ${LIBROKEN} ${LIBSL} ${LIBCRYPT}
+
+.include <bsd.prog.mk>
+
diff --git a/usr.bin/krb5-config/Makefile b/usr.bin/krb5-config/Makefile
new file mode 100644
index 000000000000..2c75bac97d26
--- /dev/null
+++ b/usr.bin/krb5-config/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2008/03/22 09:24:06 mlelstv Exp $
+
+.include <bsd.own.mk>
+
+DIST=		${NETBSDSRCDIR}/crypto/dist
+.PATH:          ${DIST}/heimdal/tools
+
+WARNS?=  1
+
+PROG= krb5-config
+MAN= krb5-config.1
+
+krb5-config: krb5-config.in
+	sed     -e "s!@PACKAGE\@!heimdal!g" \
+	        -e "s!@VERSION\@!1.0.1!g" \
+	        -e "s!@prefix\@!/!g" \
+	        -e "s!@exec_prefix\@!/!g" \
+	        -e "s!@libdir\@!/usr/lib!g" \
+	        -e "s!@includedir\@!/usr/include!g" \
+	        -e "s!@LIB_crypt\@!-lcrypt!g" \
+	        -e "s!@LIB_dbopen\@!!g" \
+	        -e "s!@INCLUDE_hcrypto\@!!g" \
+	        -e "s!@LIB_hcrypto_appl\@!-lcrypto!g" \
+	        -e "s!@LIB_dlopen\@!!g" \
+	        -e "s!@LIB_door_create\@!!g" \
+	        -e "s!@LIB_pkinit\@!-lhx509!g" \
+	        -e "s!@LIBS\@!!g" \
+	        $(DIST)/heimdal/tools/krb5-config.in > $@
+	chmod +x $@
+
+.include <bsd.prog.mk>