diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f55b902736c..964bf0293dc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-21  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* java/lang/natClass.cc (_Jv_FindMethodInCache): Mark klass, name and
+	signature as MAYBE_UNUSED for HAVE_TLS == 0.
+	(_Jv_AddMethodToCache): Mark klass and method as MAYBE_UNUSED for
+	HAVE_TLS == 0.
+
 2006-05-20  Andreas Tobler  <a.tobler@schweiz.ch>
 	    John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>