diff --git a/ChangeLog b/ChangeLog
index f8b932d6..d02b062a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-09  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/chpasswd.8.xml: Sorted options alphabetically.
+
 2009-05-09  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, src/newusers.c, src/Makefile.am: Added support for
diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml
index 03be8b55..ed074632 100644
--- a/man/chpasswd.8.xml
+++ b/man/chpasswd.8.xml
@@ -111,14 +111,6 @@
       The options which apply to the <command>chpasswd</command> command
       are:
     </para>
-    <variablelist remap='IP'>
-      <varlistentry>
-	<term><option>-h</option>, <option>--help</option></term>
-	<listitem>
-	  <para>Display help message and exit.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
     <variablelist remap='IP' condition="no_pam">
       <varlistentry>
 	<term><option>-c</option>, <option>--crypt-method</option></term>
@@ -139,6 +131,16 @@
 	  <para>Supplied passwords are in encrypted form.</para>
 	</listitem>
       </varlistentry>
+    </variablelist>
+    <variablelist remap='IP'>
+      <varlistentry>
+	<term><option>-h</option>, <option>--help</option></term>
+	<listitem>
+	  <para>Display help message and exit.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist remap='IP' condition="no_pam">
       <varlistentry>
 	<term><option>-m</option>, <option>--md5</option></term>
 	<listitem>