diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 60f05e58628d..0bea0d674de3 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su telnet
+SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su telnet krb5-config
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
new file mode 100644
index 000000000000..52a84d8a4b1d
--- /dev/null
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+srcdir=		${KRB5DIR}/tools
+
+MAN1=		krb5-config.1
+
+all:		krb5-config
+
+CLEANFILES+=	krb5-config
+
+beforeinstall:
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} krb5-config \
+	    ${DESTDIR}${BINDIR}/krb5-config
+
+krb5-config: krb5-config.in
+	sed	-e "s,@PACKAGE\@,FreeBSD heimdal,g" \
+		-e "s,@VERSION\@,0.3f,g" \
+		-e "s,@prefix\@,/,g" \
+		-e "s,@exec_prefix\@,/,g" \
+		-e "s,@libdir\@,$(LIBDIR),g" \
+		-e "s,@includedir\@,$(INCDIR),g" \
+		-e "s,@LIB_crypt\@,,g" \
+		-e "s,@LIB_dbopen\@,,g" \
+		-e "s,@LIB_des_appl\@,-lcrypto,g" \
+		-e "s,@LIBS\@,,g" \
+		$(srcdir)/krb5-config.in > $@
+	chmod +x $@
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/tools