diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index a27adbf4c684..cbf247bc6c53 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,19 +1,12 @@
-#	$NetBSD: Makefile.inc,v 1.8 2005/02/13 06:07:54 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2005/02/13 18:15:05 christos Exp $
 
 .include <bsd.own.mk>
 
 SSHDIST?= ${NETBSDSRCDIR}/crypto/dist/ssh
 
 CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP
-.if ${USE_PAM} != "no"
-CPPFLAGS+=-DUSE_PAM
-.endif
 .PATH: ${SSHDIST}
 
-.if ${USE_PAM} != "no"
-LDADD+= -lpam
-DPADD+= ${LIBPAM}
-.endif
 LDADD+=	-lssh -lcrypto -lz
 DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
 
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 0154c121324e..1ffb0cd7aa60 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2005/02/13 06:07:21 christos Exp $
+#	$NetBSD: Makefile,v 1.23 2005/02/13 18:15:05 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,13 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	monitor_mm.c monitor.c monitor_wrap.c \
 	kexdhs.c kexgexs.c
 
+.if (${USE_PAM} != "no")
+CPPFLAGS+=-DUSE_PAM
+SRCS+= auth-pam.c
+LDADD+=	-lpam
+DPADD+=	${LIBPAM}
+.endif
+
 .if (${USE_KERBEROS} != "no")
 CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5
 CPPFLAGS+=-I${DESTDIR}/usr/include/kerberosIV