diff --git a/ChangeLog b/ChangeLog
index 35ecaf88..2c5255d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-19  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/newusers.8.xml, man/chpasswd.8.xml, man/useradd.8.xml,
+	man/groupadd.8.xml, man/usermod.8.xml, man/chgpasswd.8.xml,
+	man/groupmod.8.xml: Added warning: passwords set with these tools
+	may not respect the password policy.
+
 2009-05-19  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/groupadd.8.xml: Fixed formatting issue.
diff --git a/man/chgpasswd.8.xml b/man/chgpasswd.8.xml
index 7d089ef9..502ea248 100644
--- a/man/chgpasswd.8.xml
+++ b/man/chgpasswd.8.xml
@@ -159,6 +159,10 @@
       Remember to set permissions or umask to prevent readability of
       unencrypted files by other users.
     </para>
+    <para>
+      You should make sure the passwords and the encryption method respect
+      the system's password policy.
+    </para>
   </refsect1>
 
   <refsect1 id='configuration'>
diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml
index ed074632..cca79639 100644
--- a/man/chpasswd.8.xml
+++ b/man/chpasswd.8.xml
@@ -184,6 +184,10 @@
       Remember to set permissions or umask to prevent readability of
       unencrypted files by other users.
     </para>
+    <para condition="no_pam">
+      You should make sure the passwords and the encryption method respect
+      the system's password policy.
+    </para>
   </refsect1>
 
   <refsect1 id='configuration' condition="no_pam">
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 39678990..d84ce967 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -157,6 +157,10 @@
 	    recommended because the password (or encrypted password) will
 	    be visible by users listing the processes.
 	  </para>
+	  <para>
+	    You should make sure the password respects the system's
+	    password policy.
+	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/man/groupmod.8.xml b/man/groupmod.8.xml
index c61c3e23..d2300089 100644
--- a/man/groupmod.8.xml
+++ b/man/groupmod.8.xml
@@ -134,6 +134,10 @@
 	    recommended because the password (or encrypted password) will
 	    be visible by users listing the processes.
 	  </para>
+	  <para>
+	    You should make sure the password respects the system's
+	    password policy.
+	  </para>
 	</listitem>
       </varlistentry>
     </variablelist>
diff --git a/man/newusers.8.xml b/man/newusers.8.xml
index a90c5bb7..8cda0b28 100644
--- a/man/newusers.8.xml
+++ b/man/newusers.8.xml
@@ -304,6 +304,10 @@
       The input file must be protected since it contains unencrypted
       passwords.
     </para>
+    <para condition="no_pam">
+      You should make sure the passwords and the encryption method respect
+      the system's password policy.
+    </para>
   </refsect1>
 
   <refsect1 id='configuration'>
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index ed2face6..0a6570b9 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -388,6 +388,10 @@
 	    recommended because the password (or encrypted password) will
 	    be visible by users listing the processes.
 	  </para>
+	  <para>
+	    You should make sure the password respects the system's
+	    password policy.
+	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/man/usermod.8.xml b/man/usermod.8.xml
index 793644e9..ad70ec2e 100644
--- a/man/usermod.8.xml
+++ b/man/usermod.8.xml
@@ -250,6 +250,16 @@
 	    recommended because the password (or encrypted password) will
 	    be visible by users listing the processes.
 	  </para>
+	  <para condition="pam">
+	    The password will be written in the local
+	    <filename>/etc/passwd</filename> or
+	    <filename>/etc/shadow</filename> file. This might differ from the
+	    password database configured in your PAM configuration.
+	  </para>
+	  <para>
+	    You should make sure the password respects the system's
+	    password policy.
+	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>