diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5d448cb3a..e42973579 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr 15 16:36:27 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* uname.c (uname): Default n in in86 to 6 if Windows returns > 6.
+
 Sun Apr 15 15:56:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
 	* path.cc (add_ext_from_sym): Redefine to call `add_ext_from_sym_'.
diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
index 54d07df9b..b113eafef 100644
--- a/winsup/cygwin/uname.cc
+++ b/winsup/cygwin/uname.cc
@@ -70,7 +70,9 @@ uname (struct utsname *name)
 	      break;
 	    case winNT:
 	      /* wProcessorLevel only valid in Windows NT */
-	      __small_sprintf (name->machine, "i%d86", sysinfo.wProcessorLevel);
+	      __small_sprintf (name->machine, "i%d86",
+			       sysinfo.dwProcessorType > 6 ?
+				6 : sysinfo.dwProcessorType);
 	      break;
 	    default:
 	      strcpy (name->machine, "i386");