diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1bd4ccc34c5..d3a6cea9bba 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-11  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* java/lang/natThread.cc (finalize_native): Destroy
+	join conditional variable and mutex if these destroy
+	operations are supported.
+
 2004-09-10  Dalibor Topic <robilad@kaffe.org>
 
 	* gnu/java/net/protocol/file/Connection.java (permission): New field.
diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc
index ea235ce3789..4782115d2cf 100644
--- a/libjava/java/lang/natThread.cc
+++ b/libjava/java/lang/natThread.cc
@@ -78,6 +78,12 @@ finalize_native (jobject ptr)
 {
   natThread *nt = (natThread *) ptr;
   _Jv_ThreadDestroyData (nt->thread);
+#ifdef _Jv_HaveCondDestroy
+  _Jv_CondDestroy (&nt->join_cond);
+#endif
+#ifdef _Jv_HaveMutexDestroy
+  _Jv_MutexDestroy (&nt->join_mutex);
+#endif
 }
 
 jint