diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4d9988c7d..a856a2ee0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-17  Robert Collins <rbtcollins@hotmail.com>
+
+	* thread.cc (pthread_key::set): Preserve GetLastError(). Reported
+	by Thomas Pffaf.
+
 2002-09-17  Robert Collins  <rbtcollins@hotmail.com>
 
 	This work inspires by Thomas Pfaff's pthread_fork patch (1).
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index ff1f3e6a2..5dadfee7e 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -1101,8 +1101,10 @@ pthread_key::set (const void *value)
 void *
 pthread_key::get ()
 {
-  set_errno (0);
-  return TlsGetValue (dwTlsIndex);
+  int savedError = ::GetLastError();
+  void *result = TlsGetValue (dwTlsIndex);
+  ::SetLastError (savedError);
+  return result;
 }
 
 void