diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8e43421af..dc23ecf9f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-31  Christopher Faylor  <cgf@timesys.com>
+
+	* pinfo.cc (pinfo::exit): Only return low-order 16 bits when exiting.
+
 2005-01-31  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_process.cc (format_process_maps): Get destbuf argument by
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 6df0f5e0c..1c67f8764 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -159,7 +159,7 @@ pinfo::exit (DWORD n)
   _my_tls.stackptr = _my_tls.stack;
   sigproc_printf ("Calling ExitProcess hProcess %p, n %p, exitcode %p",
 		  hProcess, n, exitcode);
-  ExitProcess (exitcode);
+  ExitProcess (exitcode & 0xffff);
 }
 # undef self