diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 86dea8af24aa..b7c39801238a 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	kadmin kdestroy kinit klist kpasswd ksu krb5-config
+SUBDIR=	kadmin kdestroy kinit klist kpasswd ksu krb5-config \
+	verify_krb5_conf
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
new file mode 100644
index 000000000000..cd0dc7ad39a1
--- /dev/null
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+PROG=	verify_krb5_conf
+
+SRCS=	verify_krb5_conf.c
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/lib/kafs	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${.OBJDIR}
+
+LDADD=	-lkrb5 -lroken -lkafs5 ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+
+MAN=	verify_krb5_conf.8
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/lib/krb5