diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b92b98eed531..bd5c1a919f6a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-13  Martin Kahlert  <martin.kahlert@infineon.com>
+
+	* jni.cc (_Jv_JNI_AttachCurrentThread): env->locals assigned
+	correctly.
+
 2002-02-13  Todd Stock  <toddastock@yahoo.com>
 
 	Fix for PR libgcj/5671:
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 9ee0df4a4511..04622f0b6719 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -2134,8 +2134,7 @@ _Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args)
 
   env->locals->marker = MARK_SYSTEM;
   env->locals->size = FRAME_SIZE;
-  env->locals->next = env->locals;
-  env->locals = NULL;
+  env->locals->next = NULL;
 
   for (int i = 0; i < env->locals->size; ++i)
     env->locals->vec[i] = NULL;