diff --git a/ChangeLog b/ChangeLog
index 8e081c4c..177ba7bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-21  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* etc/pam.d/Makefile.am: Distribute all pam.d files, even if
+	ACCT_TOOLS_SETUID is not enabled.
+
 2009-04-21  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* lib/shadowmem.c: Added spw_free().
diff --git a/etc/pam.d/Makefile.am b/etc/pam.d/Makefile.am
index 293c1e50..d967eb95 100644
--- a/etc/pam.d/Makefile.am
+++ b/etc/pam.d/Makefile.am
@@ -9,8 +9,7 @@ pamd_files = \
 	passwd \
 	su
 
-if ACCT_TOOLS_SETUID
-pamd_files += \
+pamd_acct_tools_files = \
 	chage \
 	chgpasswd \
 	chpasswd \
@@ -21,11 +20,13 @@ pamd_files += \
 	useradd \
 	userdel \
 	usermod
-endif
 
 if USE_PAM
 pamddir = $(sysconfdir)/pam.d
 pamd_DATA = $(pamd_files)
+if ACCT_TOOLS_SETUID
+pamd_DATA += $(pamd_acct_tools_files)
+endif
 endif
 
-EXTRA_DIST = $(pamd_files)
+EXTRA_DIST = $(pamd_files) $(pamd_acct_tools_files)