diff --git a/ChangeLog b/ChangeLog
index d87b55c47e..a94939dc8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-09-06  Ulrich Drepper  <drepper@redhat.com>
 
+	* include/errno.h: Use errno definition with __thread for now only
+	in libc and ld.so.
+
 	* test-skeleton.c (main): Improve error message for unexpected
 	signal case.
 
diff --git a/include/errno.h b/include/errno.h
index 934dae791a..e9add9196a 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -6,7 +6,7 @@
 
 # include <tls.h>		/* Defines USE_TLS.  */
 
-# if USE_TLS && HAVE___THREAD
+# if USE_TLS && HAVE___THREAD && (!defined NOT_IN_libc || defined IS_IN_rtld)
 #  undef  errno
 #  define errno errno		/* For #ifndef errno tests.  */
 extern __thread int errno;