diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index b9635f71df..337adfdb92 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-20	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* score/src/corerwlock.c: Make sure structure is fully initialized.
+	When reused, some fields will not be zero like at initialization.
+
 2007-06-20	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* sapi/include/confdefs.h: POSIX threads use twice the minimum stack
diff --git a/cpukit/score/src/corerwlock.c b/cpukit/score/src/corerwlock.c
index 3629f146aa..e9b9363feb 100644
--- a/cpukit/score/src/corerwlock.c
+++ b/cpukit/score/src/corerwlock.c
@@ -52,6 +52,8 @@ void _CORE_RWLock_Initialize(
 /*
   the_rwlock->number_of_waiting_threads = 0;
 */
+  the_rwlock->number_of_readers = 0;
+  the_rwlock->current_state = CORE_RWLOCK_UNLOCKED;
 
   _Thread_queue_Initialize(
     &the_rwlock->Wait_queue,