diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 59f7e94aa6c..82833d327f5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-01  Matt Welsh <mdw@cs.berkeley.edu>
+
+	* java/lang/natClass.cc: Fixed notification of threads
+	when class initialization is complete.
+
 1999-09-01  Tom Tromey  <tromey@cygnus.com>
 
 	* java/lang/reflect/Modifier.java (ALL_FLAGS): New constant.
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index ff5e9c65da5..2a8bb3b3f9a 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -455,7 +455,7 @@ java::lang::Class::initializeClass (void)
 	  // Caught an exception.
 	  _Jv_MonitorEnter (this);
 	  state = JV_STATE_ERROR;
-	  notify ();
+	  notifyAll ();
 	  _Jv_MonitorExit (this);
 	  JvThrow (except);
 	}
@@ -482,7 +482,7 @@ java::lang::Class::initializeClass (void)
       _Jv_MonitorEnter (this);
       state = JV_STATE_ERROR;
     }
-  notify ();
+  notifyAll ();
   _Jv_MonitorExit (this);
   if (except)
     JvThrow (except);