diff --git a/ChangeLog b/ChangeLog
index 1361ba1a..2f88eb85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-04  Mark Rosenstand  <mark@borkware.net>
+
+	* NEWS, etc/pam.d/Makefile.am: Add chfn, chsh, and userdel to
+	$(pamd_files). Remove the duplicate useradd. And sort
+	alphabetically.
+
+2008-04-04  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* NEWS: Prepare next release, 4.1.2.
+
 2008-04-02  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, configure.in: Prepare release 4.1.1
diff --git a/NEWS b/NEWS
index ab457637..4e1b16a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 $Id$
 
+shadow-4.1.1 -> shadow-4.1.2						UNRELEASED
+
+*** general:
+- packaging
+  * Distribute the chfn, chsh, and userdel PAM configuration file.
+
 shadow-4.1.0 -> shadow-4.1.1						02-04-2008
 
 *** general:
diff --git a/etc/pam.d/Makefile.am b/etc/pam.d/Makefile.am
index 71805267..44deb6f7 100644
--- a/etc/pam.d/Makefile.am
+++ b/etc/pam.d/Makefile.am
@@ -2,19 +2,21 @@
 # and also cooperate to make a distribution for `make dist'
 
 pamd_files = \
-	passwd \
-	su \
-	useradd \
 	chage \
+	chfn \
 	chgpasswd \
 	chpasswd \
+	chsh \
 	groupadd \
 	groupdel \
 	groupmems \
 	groupmod \
 	login \
 	newusers \
+	passwd \
+	su \
 	useradd \
+	userdel \
 	usermod
 
 if USE_PAM