diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index 6f2f13dcc447..47dc27861d46 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -49,7 +49,7 @@ DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
 		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
 		${LIBSL} ${LIBREADLINE}
-NOMAN=		yes
+MAN=		k5admin.8
 
 .include <bsd.prog.mk>
 
@@ -67,5 +67,8 @@ kadm5/kadm5_err.h: kadm5 kadm5_err.h
 kadm5:
 	mkdir ${.TARGET}
 
+k5admin.8:	kadmin.8
+	ln -sf ${.OODATE} ${.TARGET}
+
 CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
 CLEANDIRS+=	kadm5
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 6f2f13dcc447..47dc27861d46 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -49,7 +49,7 @@ DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
 		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
 		${LIBSL} ${LIBREADLINE}
-NOMAN=		yes
+MAN=		k5admin.8
 
 .include <bsd.prog.mk>
 
@@ -67,5 +67,8 @@ kadm5/kadm5_err.h: kadm5 kadm5_err.h
 kadm5:
 	mkdir ${.TARGET}
 
+k5admin.8:	kadmin.8
+	ln -sf ${.OODATE} ${.TARGET}
+
 CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
 CLEANDIRS+=	kadm5