diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 04a4c3a24..d07d83362 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-12  Igor Pechtchanski <pechtcha@cs.nyu.edu>
+	* cygpath.cc (options) New global variable.
+	(main) Make short options global for easier change.
+	(print_version) Add a missing newline.
+
 2002-08-07  Igor Pechtchanski <pechtcha@cs.nyu.edu>
 
 	* regtool.cc (find_key): Add support for custom key separator.
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index cbfec3b58..8ba2811c0 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -57,6 +57,8 @@ static struct option long_options[] = {
   {0, no_argument, 0, 0}
 };
 
+static char options[] = "ac:df:hilmopst:uvwADHPSW";
+
 static void
 usage (FILE * stream, int status)
 {
@@ -534,7 +536,8 @@ print_version ()
 cygpath (cygwin) %.*s\n\
 Path Conversion Utility\n\
 Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s", len, v, __DATE__);
+Compiled on %s\n\
+", len, v, __DATE__);
 }
 
 int
@@ -562,7 +565,7 @@ main (int argc, char **argv)
   options_from_file_flag = 0;
   allusers_flag = 0;
   output_flag = 0;
-  while ((c = getopt_long (argc, argv, (char *) "ac:df:hilmopst:uvwADHPSW",
+  while ((c = getopt_long (argc, argv, options,
 			   long_options, (int *) NULL)) != EOF)
     {
       switch (c)