diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile
--- a/lib/libpam/modules/pam_chroot/Makefile
+++ b/lib/libpam/modules/pam_chroot/Makefile
@@ -1,5 +1,5 @@
 LIB=		pam_chroot
 SRCS=		pam_chroot.c
-MAN=		pam_chroot.8
+MANNODEV=	pam_chroot.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile
--- a/lib/libpam/modules/pam_deny/Makefile
+++ b/lib/libpam/modules/pam_deny/Makefile
@@ -23,8 +23,8 @@
 # SUCH DAMAGE.
 #
 
-LIB=	pam_deny
-SRCS=	pam_deny.c
-MAN=	pam_deny.8
+LIB=		pam_deny
+SRCS=		pam_deny.c
+MANNODEV=	pam_deny.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile
--- a/lib/libpam/modules/pam_echo/Makefile
+++ b/lib/libpam/modules/pam_echo/Makefile
@@ -1,5 +1,5 @@
-LIB=	pam_echo
-SRCS=	pam_echo.c
-MAN=	pam_echo.8
+LIB=		pam_echo
+SRCS=		pam_echo.c
+MANNODEV=	pam_echo.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile
--- a/lib/libpam/modules/pam_exec/Makefile
+++ b/lib/libpam/modules/pam_exec/Makefile
@@ -1,6 +1,6 @@
-LIB=	pam_exec
-SRCS=	pam_exec.c
-MAN=	pam_exec.8
+LIB=		pam_exec
+SRCS=		pam_exec.c
+MANNODEV=	pam_exec.8
 
 WARNS?=	1
 
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile
--- a/lib/libpam/modules/pam_ftpusers/Makefile
+++ b/lib/libpam/modules/pam_ftpusers/Makefile
@@ -1,5 +1,5 @@
-LIB=	pam_ftpusers
-SRCS=	pam_ftpusers.c
-MAN=	pam_ftpusers.8
+LIB=		pam_ftpusers
+SRCS=		pam_ftpusers.c
+MANNODEV=	pam_ftpusers.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile
--- a/lib/libpam/modules/pam_group/Makefile
+++ b/lib/libpam/modules/pam_group/Makefile
@@ -1,5 +1,5 @@
 LIB=		pam_group
 SRCS=		pam_group.c
-MAN=		pam_group.8
+MANNODEV=	pam_group.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile
--- a/lib/libpam/modules/pam_guest/Makefile
+++ b/lib/libpam/modules/pam_guest/Makefile
@@ -1,5 +1,5 @@
 LIB=		pam_guest
 SRCS=		pam_guest.c
-MAN=		pam_guest.8
+MANNODEV=	pam_guest.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -57,8 +57,8 @@
 	support.c \
 	vector.c
 
-MAN=	pam-krb5.8
-MLINKS=	pam-krb5.8 pam_krb5.8
+MANNODEV=	pam-krb5.8
+MANNODEVLINKS=	pam-krb5.8 pam_krb5.8
 
 CFLAGS=	-I${SRCDIR} \
 	-I${.CURDIR} \
@@ -77,9 +77,9 @@
 .else
 PACKAGE=	kerberos
 
-LIB=	pam_krb5
-SRCS=	pam_krb5.c
-MAN=	pam_krb5.8
+LIB=		pam_krb5
+SRCS=		pam_krb5.c
+MANNODEV=	pam_krb5.8
 .if defined(_FREEFALL_CONFIG)
 CFLAGS+=-D_FREEFALL_CONFIG
 WARNS?=	3
diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile
--- a/lib/libpam/modules/pam_ksu/Makefile
+++ b/lib/libpam/modules/pam_ksu/Makefile
@@ -27,9 +27,10 @@
 
 .include <src.opts.mk>
 
-LIB=	pam_ksu
-SRCS=	pam_ksu.c
-MAN=	pam_ksu.8
+LIB=		pam_ksu
+SRCS=		pam_ksu.c
+MANNODEV=	pam_ksu.8
+
 WARNS?=	3
 
 LIBADD+=	krb5
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -25,8 +25,8 @@
 
 PACKAGE=	runtime
 
-LIB=	pam_lastlog
-SRCS=	pam_lastlog.c
-MAN=	pam_lastlog.8
+LIB=		pam_lastlog
+SRCS=		pam_lastlog.c
+MANNODEV=	pam_lastlog.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile
--- a/lib/libpam/modules/pam_login_access/Makefile
+++ b/lib/libpam/modules/pam_login_access/Makefile
@@ -25,8 +25,8 @@
 
 PACKAGE=	runtime
 
-LIB=	pam_login_access
-SRCS=	pam_login_access.c login_access.c
-MAN=	login.access.5 pam_login_access.8
+LIB=		pam_login_access
+SRCS=		pam_login_access.c login_access.c
+MANNODEV=	login.access.5 pam_login_access.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile
--- a/lib/libpam/modules/pam_nologin/Makefile
+++ b/lib/libpam/modules/pam_nologin/Makefile
@@ -25,9 +25,9 @@
 
 PACKAGE=	runtime
 
-LIB=	pam_nologin
-SRCS=	pam_nologin.c
-MAN=	pam_nologin.8
+LIB=		pam_nologin
+SRCS=		pam_nologin.c
+MANNODEV=	pam_nologin.8
 
 LIBADD+=	util
 
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile
--- a/lib/libpam/modules/pam_passwdqc/Makefile
+++ b/lib/libpam/modules/pam_passwdqc/Makefile
@@ -1,9 +1,9 @@
 SRCDIR=	${SRCTOP}/contrib/pam_modules/pam_passwdqc
 .PATH: ${SRCDIR}
 
-LIB=	pam_passwdqc
-SRCS=	pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
-MAN=	pam_passwdqc.8
+LIB=		pam_passwdqc
+SRCS=		pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
+MANNODEV=	pam_passwdqc.8
 
 WARNS?=	2
 CFLAGS+= -I${SRCDIR}
diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile
--- a/lib/libpam/modules/pam_permit/Makefile
+++ b/lib/libpam/modules/pam_permit/Makefile
@@ -23,8 +23,8 @@
 # SUCH DAMAGE.
 #
 
-LIB=	pam_permit
-SRCS=	pam_permit.c
-MAN=	pam_permit.8
+LIB=		pam_permit
+SRCS=		pam_permit.c
+MANNODEV=	pam_permit.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -23,9 +23,10 @@
 # SUCH DAMAGE.
 #
 
-LIB=	pam_radius
-SRCS=	pam_radius.c
-MAN=	pam_radius.8
+LIB=		pam_radius
+SRCS=		pam_radius.c
+MANNODEV=	pam_radius.8
+
 WARNS?=	3
 
 LIBADD+=	radius
diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile
--- a/lib/libpam/modules/pam_rhosts/Makefile
+++ b/lib/libpam/modules/pam_rhosts/Makefile
@@ -1,5 +1,5 @@
-LIB=	pam_rhosts
-SRCS=	pam_rhosts.c
-MAN=	pam_rhosts.8
+LIB=		pam_rhosts
+SRCS=		pam_rhosts.c
+MANNODEV=	pam_rhosts.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile
--- a/lib/libpam/modules/pam_rootok/Makefile
+++ b/lib/libpam/modules/pam_rootok/Makefile
@@ -23,8 +23,8 @@
 # SUCH DAMAGE.
 #
 
-LIB=	pam_rootok
-SRCS=	pam_rootok.c
-MAN=	pam_rootok.8
+LIB=		pam_rootok
+SRCS=		pam_rootok.c
+MANNODEV=	pam_rootok.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile
--- a/lib/libpam/modules/pam_securetty/Makefile
+++ b/lib/libpam/modules/pam_securetty/Makefile
@@ -25,8 +25,8 @@
 
 PACKAGE=	runtime
 
-LIB=	pam_securetty
-SRCS=	pam_securetty.c
-MAN=	pam_securetty.8
+LIB=		pam_securetty
+SRCS=		pam_securetty.c
+MANNODEV=	pam_securetty.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile
--- a/lib/libpam/modules/pam_self/Makefile
+++ b/lib/libpam/modules/pam_self/Makefile
@@ -25,8 +25,8 @@
 
 PACKAGE=	runtime
 
-LIB=	pam_self
-SRCS=	pam_self.c
-MAN=	pam_self.8
+LIB=		pam_self
+SRCS=		pam_self.c
+MANNODEV=	pam_self.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -2,11 +2,12 @@
 
 SSHDIR=	${SRCTOP}/crypto/openssh
 
-LIB=	pam_ssh
-MAN=	pam_ssh.8
-SRCS=	pam_ssh.c
 PACKAGE=	ssh
 
+LIB=		pam_ssh
+MANNODEV=	pam_ssh.8
+SRCS=		pam_ssh.c
+
 WARNS?=	5
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 SRCS+=	 ssh_namespace.h
diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile
--- a/lib/libpam/modules/pam_tacplus/Makefile
+++ b/lib/libpam/modules/pam_tacplus/Makefile
@@ -23,9 +23,9 @@
 # SUCH DAMAGE.
 #
 
-LIB=	pam_tacplus
-SRCS=	pam_tacplus.c
-MAN=	pam_tacplus.8
+LIB=		pam_tacplus
+SRCS=		pam_tacplus.c
+MANNODEV=	pam_tacplus.8
 
 LIBADD+=	tacplus
 
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -38,9 +38,9 @@
 
 PACKAGE=	runtime
 
-LIB=	pam_unix
-SRCS=	pam_unix.c
-MAN=	pam_unix.8
+LIB=		pam_unix
+SRCS=		pam_unix.c
+MANNODEV=	pam_unix.8
 
 LIBADD+=	util crypt
 
diff --git a/lib/libpam/modules/pam_xdg/Makefile b/lib/libpam/modules/pam_xdg/Makefile
--- a/lib/libpam/modules/pam_xdg/Makefile
+++ b/lib/libpam/modules/pam_xdg/Makefile
@@ -1,5 +1,5 @@
-LIB=	pam_xdg
-SRCS=	pam_xdg.c
-MAN=	pam_xdg.8
+LIB=		pam_xdg
+SRCS=		pam_xdg.c
+MANNODEV=	pam_xdg.8
 
 .include <bsd.lib.mk>