diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ff1aa8d0d31..000a087b1a7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-21  Anthony Green  <green@redhat.com>
+
+	* java/lang/natClass.cc (getClassLoader): Circumvent infinite
+	recursion when searching for the system ClassLoader.
+
 2004-03-21  Ito Kazumitsu <kaz@maczuka.gcd.org>
 
         * java/net/ServerSocket.java
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index ba676ab65cd..c11d2a15340 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -1,6 +1,7 @@
 // natClass.cc - Implementation of java.lang.Class native methods.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004  
+   Free Software Foundation
 
    This file is part of libgcj.
 
@@ -151,7 +152,7 @@ java::lang::Class::getClassLoader (void)
   // `null' instead.
   if (isPrimitive ())
     return NULL;
-  return loader ? loader : ClassLoader::getSystemClassLoader ();
+  return loader ? loader : ClassLoader::systemClassLoader;
 }
 
 java::lang::reflect::Constructor *