diff --git a/ChangeLog b/ChangeLog
index 6c59139f..be7d19e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-17  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/passwd.c: Fix typo: the warndays option was called warning.
+	This is now warndays, as documented in the manpage and usage.
+	Debian patch 417_passwd_warndays.
+
 2007-11-17  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, src/pwck.c: Remove the preprocessor check SHADOWPWD. The
diff --git a/src/passwd.c b/src/passwd.c
index 49afaeb5..dbe1a2db 100644
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -654,7 +654,7 @@ int main (int argc, char **argv)
 			{"repository", required_argument, NULL, 'r'},
 			{"status", no_argument, NULL, 'S'},
 			{"unlock", no_argument, NULL, 'u'},
-			{"warning", required_argument, NULL, 'w'},
+			{"warndays", required_argument, NULL, 'w'},
 			{"maxdays", required_argument, NULL, 'x'},
 			{NULL, 0, NULL, '\0'}
 		};