diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a0a782ab486..b5b4ef4cdf8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-09  Tom Tromey  <tromey@redhat.com>
+
+	* java/lang/Class.java (getClassLoaderInternal): Now native.
+
 2006-06-09  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
diff --git a/libjava/java/lang/Class.java b/libjava/java/lang/Class.java
index 7c3eced4c71..b462465c2ed 100644
--- a/libjava/java/lang/Class.java
+++ b/libjava/java/lang/Class.java
@@ -1,5 +1,5 @@
 /* Class.java -- Representation of a Java class.
-   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation
 
 This file is part of GNU Classpath.
@@ -203,10 +203,7 @@ public final class Class implements Type, GenericDeclaration, Serializable
    *  Internal method that circumvents the usual security checks when 
    *  getting the class loader.
    */
-  private ClassLoader getClassLoaderInternal ()
-  {
-    return loader;
-  }
+  private native ClassLoader getClassLoaderInternal ();
 
   /**
    * If this is an array, get the Class representing the type of array.