diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index 827cfbb903d2..310aecd87e7e 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -10,6 +10,7 @@ PAMD +=	imap
 PAMD +=	kde
 PAMD +=	login
 PAMD +=	other
+PAMD +=	passwd
 PAMD +=	pop3
 PAMD +=	rsh
 PAMD +=	sshd
diff --git a/etc/pam.d/passwd b/etc/pam.d/passwd
new file mode 100644
index 000000000000..d732c42266f9
--- /dev/null
+++ b/etc/pam.d/passwd
@@ -0,0 +1,11 @@
+#
+# $FreeBSD$
+#
+# PAM configuration for the "passwd" service
+#
+
+# passwd(1) does not use the auth, account or session services.
+
+# password
+#password	requisite	pam_passwdqc.so	enforce=users
+password	required	pam_unix.so	no_warn try_first_pass