diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index c61ec162d6b..d7b08aafea7 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -14,6 +14,7 @@ MODULES		+= pam_login_access
 MODULES		+= pam_nologin
 MODULES		+= pam_opie
 MODULES		+= pam_opieaccess
+MODULES		+= pam_passwdqc
 MODULES		+= pam_permit
 MODULES		+= pam_radius
 MODULES		+= pam_rootok
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile
new file mode 100644
index 00000000000..ddb5cbdeb93
--- /dev/null
+++ b/lib/libpam/modules/pam_passwdqc/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+SRCDIR=		${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+
+LIB=		pam_passwdqc
+SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
+SRCS=		pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
+CFLAGS+=	-I${SRCDIR} -DPAM_AUTHTOK_RECOVER_ERR=PAM_AUTHTOK_RECOVERY_ERR
+MAN=		#pam_passwdqc.8
+
+.include <bsd.lib.mk>
+
+.PATH:		${SRCDIR}