diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index 828271af0f1b..82e4fda68c07 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -6,9 +6,9 @@ SSHSRC=	${.CURDIR}/../../../../crypto/openssh
 LIB=		pam_ssh
 SHLIB_NAME=	pam_ssh.so
 SRCS=		pam_ssh.c
-CFLAGS=		-I${SSHSRC}
-DPADD+=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-LDADD+=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \
+CFLAGS+=	-I${SSHSRC}
+DPADD=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+LDADD=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \
 		-lcrypt -lutil -lz
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index 2e18050c6aa9..606091232723 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -517,5 +517,4 @@ pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
 	PAM_RETURN(PAM_SUCCESS);
 }
 
-
-PAM_MODULE_ENTRY(MODULE_NAME);
+PAM_MODULE_ENTRY("pam_ssh");