diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 77fa244ef..c641f74dc 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-14   Chris Genly  <chgenly@alum.mit.edu>
+
+	* regtool.cc (find_key): Handle keys with only one subkey.
+
 Wed Jun 27 22:46:10 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* regtool.cc (find_key): Revert previous change.
diff --git a/winsup/utils/regtool.cc b/winsup/utils/regtool.cc
index e1eb4e08a..6068f3a3d 100644
--- a/winsup/utils/regtool.cc
+++ b/winsup/utils/regtool.cc
@@ -221,11 +221,15 @@ find_key (int howmanyparts, REGSAM access)
 	e--;
       if (*e != '\\')
 	{
-	  fprintf (stderr, "Invalid key\n");
-	  exit (1);
+	  key = wkprefixes[i].key;
+	  value = n;
+	  return;
+	}
+      else
+        {
+	  *e = 0;
+	  value = e + 1;
 	}
-      *e = 0;
-      value = e + 1;
     }
   if (n[0] == 0)
     {