diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 38fb67c3b..15e954b52 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-06  Bas van Gompel  <cygwin-patch.buzz@bavag.tmfweb.nl>
+
+	* cygcheck.cc (dump_sysinfo): Warn about empty path-components.
+
 2004-10-04  Bas van Gompel  <cygwin-patch.buzz@bavag.tmfweb.nl>
 
 	* cygcheck.cc (pretty_id): Close pipe.
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index f5008e983..8dc1b21d5 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -957,7 +957,10 @@ dump_sysinfo ()
   while (1)
     {
       for (e = s; *e && *e != sep; e++);
-      printf ("\t%.*s\n", e - s, s);
+      if (e-s)
+        printf ("\t%.*s\n", e - s, s);
+      else
+        puts ("\tWarning: Empty path-component");
       count_path_items++;
       if (!*e)
 	break;