diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index 816f7114050f..b21882937d73 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	k5admin k5destroy k5init k5list k5passwd
+SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/k5su/Makefile b/kerberos5/usr.bin/k5su/Makefile
new file mode 100644
index 000000000000..060cf65a052c
--- /dev/null
+++ b/kerberos5/usr.bin/k5su/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PROG=		k5su
+SRCS=		su.c asn1_err.h krb5_err.h heim_err.h
+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}
+NOMAN=		true
+.if defined(MAKE_KERBEROS4) && \
+	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
+_krb4libs=	-L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5
+_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
+		-L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
+		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/appl/su
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
new file mode 100644
index 000000000000..060cf65a052c
--- /dev/null
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PROG=		k5su
+SRCS=		su.c asn1_err.h krb5_err.h heim_err.h
+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}
+NOMAN=		true
+.if defined(MAKE_KERBEROS4) && \
+	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
+_krb4libs=	-L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5
+_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
+		-L${ROKENOBJDIR} -lroken \
+		-L${VERSOBJDIR} -lvers \
+		${_krb4libs} \
+		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/appl/su