diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 19436ec07..223a4643d 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-09  Corinna Vinschen  <corinna@vinschen.de>
+
+	* passwd.cc: Add -v option to print version information as well, since
+	it's used in older csih.
+
 2012-02-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* utils.sgml: Fix typos.
diff --git a/winsup/utils/passwd.c b/winsup/utils/passwd.c
index cd2ca47bd..210f283c9 100644
--- a/winsup/utils/passwd.c
+++ b/winsup/utils/passwd.c
@@ -1,6 +1,6 @@
 /* passwd.c: Changing passwords and managing account information
 
-   Copyright 1999, 2000, 2001, 2002, 2003, 2008, 2009, 2011 Red Hat, Inc.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2008, 2009, 2011, 2012 Red Hat, Inc.
 
    Written by Corinna Vinschen <corinna.vinschen@cityweb.de>
 
@@ -57,7 +57,7 @@ static struct option longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static char opts[] = "cCd:eEhi:ln:pPuVx:L:SR";
+static char opts[] = "cCd:eEhi:ln:pPuvVx:L:SR";
 
 int
 eprint (int with_name, const char *fmt, ...)
@@ -482,6 +482,8 @@ main (int argc, char **argv)
 	break;
 
       case 'V':
+      case 'v':		/* Keep this option for historrical reasons,
+			   but don't advertize it. */
 	print_version ();
 	exit (0);
 	break;