diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index cc114c819..0c878e1fc 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-15  Joerg Schaible <joerg.schaible@gmx.de>
+
+	* cygpath.cc (doit): Empty file ignored using option -i.
+
 2002-01-15  Mark Bradshaw  <bradshaw@crosswalk.com>
 
 	* mkpasswd.c (print_win_error): Add a new function.
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 2ba54a185..dbaaae0d8 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -161,8 +161,13 @@ doit (char *filename)
       len = strlen (filename) + 100;
       if (len == 100)
         {
-          fprintf(stderr, "%s: can't convert empty path\n", prog_name);
-          exit (1);
+          if (!ignore_flag)
+            {
+              fprintf(stderr, "%s: can't convert empty path\n", prog_name);
+              exit (1);
+            }
+          else
+            exit (0);
         }
     }
   else