diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index c18111a4d6fe..3423b0637f60 100644
--- a/kerberos5/Makefile
+++ b/kerberos5/Makefile
@@ -3,7 +3,7 @@
 SUBDIR=	doc lib libexec usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
-KPROGS=	secure/usr.bin/ssh secure/usr.sbin/sshd
+KPROGS=	lib/libpam secure/usr.bin/ssh secure/usr.sbin/sshd
 
 # This target is used to rebuild these programs WITH Kerberos.
 kerberize:
diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
index e3681558e2d1..588a4f4edfc2 100644
--- a/kerberosIV/Makefile
+++ b/kerberosIV/Makefile
@@ -5,7 +5,7 @@ MAINTAINER=	markm@FreeBSD.org
 SUBDIR=	include lib libexec usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
-KPROGS=	bin/rcp libexec/ftpd libexec/rlogind libexec/rshd \
+KPROGS=	bin/rcp lib/libpam libexec/ftpd libexec/rlogind libexec/rshd \
 	sbin/dump sbin/restore usr.bin/login usr.bin/passwd \
 	usr.bin/rlogin usr.bin/rsh usr.bin/su
 # kerberosIV'ed cvs is broken
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index a0b4860346b9..5a1794f4e9a6 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -26,3 +26,11 @@
 
 SHLIB_MAJOR=	2
 
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if defined(MAKE_KERBEROS4) 
+DISTRIBUTION+=	krb4
+.endif
+.if defined(MAKE_KERBEROS5)
+DISTRIBUTION+=	krb5
+.endif
+.endif