diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f47401c9018fd037471864290588a55bab9874cb..c2baccfe8f654e58d9a2976708052d63d35ad09e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-31  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* java/lang/VMClassLoader.java (initialize): Set default library
+	control to LIB_NEVER.
+
 2006-05-31  Alan Modra  <amodra@bigpond.net.au>
 
 	* stacktrace.cc (_Jv_StackTrace::UpdateNCodeMap): Don't add
diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java
index 73fb539fc1f4854f60b92cc56c2e7aaad272eb8e..21019b75757b7796d6a1c4d561be52f472b63db3 100644
--- a/libjava/java/lang/VMClassLoader.java
+++ b/libjava/java/lang/VMClassLoader.java
@@ -309,7 +309,7 @@ final class VMClassLoader
     else if ("full".equals(p))
       lib_control = LIB_FULL;
     else
-      lib_control = LIB_CACHE;
+      lib_control = LIB_NEVER;
 
     tried_libraries = new HashSet();
   }