diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6bfb28c34..81ad7d148 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-25  Christopher Faylor  <cgf@redhat.com>
+
+	* cygthread.cc (cygthread::detach): Set errno with set_sig_errno so
+	that EINTR is properly restored after signal.
+
 2002-12-21  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.in: Default fhandler objects to -fomit-frame-pointer.
diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
index 48f6c5b15..5328a39bd 100644
--- a/winsup/cygwin/cygthread.cc
+++ b/winsup/cygwin/cygthread.cc
@@ -297,7 +297,7 @@ cygthread::detach (HANDLE sigwait)
 	  else
 	    {
 	      terminate_thread ();
-	      set_errno (EINTR);	/* caller should be dealing with return
+	      set_sig_errno (EINTR);	/* caller should be dealing with return
 					   values. */
 	      avail = 0;
 	      signalled = true;