diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4b21ef3be..94c5b064e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-12  Thomas Pfaff  <tpfaff@gmx.net>
+
+	* thread.cc (pthread_attr_init): Revert change from 2003-06-11
+	to return 0 if attribute is already initialized back to EBUSY.
+	(pthread_condattr_init): Ditto.
+	(pthread_rwlockattr_init): Ditto.
+	(pthread_mutexattr_init): Ditto.
+
 2003-06-12  Corinna Vinschen  <corinna@vinschen.de>
 
 	* exceptions.cc (ctrl_c_handler): Don't send a signal on
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index dbf5d7f76..ac7d4b8c0 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -1965,7 +1965,7 @@ extern "C" int
 pthread_attr_init (pthread_attr_t *attr)
 {
   if (pthread_attr::is_good_object (attr))
-    return 0;
+    return EBUSY;
 
   *attr = new pthread_attr;
   if (!pthread_attr::is_good_object (attr))
@@ -2490,7 +2490,7 @@ extern "C" int
 pthread_condattr_init (pthread_condattr_t *condattr)
 {
   if (pthread_condattr::is_good_object (condattr))
-    return 0;
+    return EBUSY;
 
   *condattr = new pthread_condattr;
   if (!pthread_condattr::is_good_object (condattr))
@@ -2676,7 +2676,7 @@ extern "C" int
 pthread_rwlockattr_init (pthread_rwlockattr_t *rwlockattr)
 {
   if (pthread_rwlockattr::is_good_object (rwlockattr))
-    return 0;
+    return EBUSY;
 
   *rwlockattr = new pthread_rwlockattr;
   if (!pthread_rwlockattr::is_good_object (rwlockattr))
@@ -2936,7 +2936,7 @@ extern "C" int
 pthread_mutexattr_init (pthread_mutexattr_t *attr)
 {
   if (pthread_mutexattr::is_good_object (attr))
-    return 0;
+    return EBUSY;
 
   *attr = new pthread_mutexattr ();
   if (!pthread_mutexattr::is_good_object (attr))