diff --git a/ChangeLog b/ChangeLog
index 5eb2d847..e91c4d58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15  Thorsten Kukuk  <kukuk@suse.de>
+
+	* src/faillog.c, man/faillog.8.xml: Harmonize long option in code
+	and documentation. Use --lock-secs instead of --lock-time.
+
 2009-10-05  Miroslav Kure  <kurem@upcase.inf.upol.cz>
 
 	* po/cs.po: updated to 412t
diff --git a/man/faillog.8.xml b/man/faillog.8.xml
index de4dd4aa..c1a6b872 100644
--- a/man/faillog.8.xml
+++ b/man/faillog.8.xml
@@ -84,7 +84,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-l</option>, <option>--lock-time</option>
+	  <option>-l</option>, <option>--lock-secs</option>
 	  <replaceable>SEC</replaceable>
 	</term>
 	<listitem>
diff --git a/src/faillog.c b/src/faillog.c
index abd4a9ff..09bdbb7e 100644
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -90,7 +90,7 @@ static void usage (int status)
 	                "faillog");
 	(void) fputs (_("  -a, --all                     display faillog records for all users\n"), usageout);
 	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
-	(void) fputs (_("  -l, --lock-time SEC           after failed login lock account for SEC seconds\n"), usageout);
+	(void) fputs (_("  -l, --lock-secs SEC           after failed login lock account for SEC seconds\n"), usageout);
 	(void) fputs (_("  -m, --maximum MAX             set maximum failed login counters to MAX\n"), usageout);
 	(void) fputs (_("  -r, --reset                   reset the counters of login failures\n"), usageout);
 	(void) fputs (_("  -t, --time DAYS               display faillog records more recent than DAYS\n"), usageout);