diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e9e6f89aff2..38346865b05 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-21  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* gnu/gcj/runtime/BootClassLoader.java (BootClassLoader): Pass
+	`null' parent ClassLoader to parent constructor.
+	* gnu/gcj/runtime/HelperClassLoader.java (HelperClassLoader): New
+	constructor.
+
 2005-09-21  Ranjit Mathew  <rmathew@gcc.gnu.org>
 
 	* testsuite/libjava.jacks/jacks.xfail: Updated for PR java/23891.
diff --git a/libjava/gnu/gcj/runtime/BootClassLoader.java b/libjava/gnu/gcj/runtime/BootClassLoader.java
index d2091720a4f..84952359aab 100644
--- a/libjava/gnu/gcj/runtime/BootClassLoader.java
+++ b/libjava/gnu/gcj/runtime/BootClassLoader.java
@@ -23,6 +23,9 @@ public final class BootClassLoader extends HelperClassLoader
 {
   BootClassLoader(String libdir)
   {
+    // The BootClassLoader is the top of the delegation chain. It does not
+    // have a parent.
+    super((ClassLoader) null);
     addDirectoriesFromProperty("java.endorsed.dirs");
     addDirectoriesFromProperty("gnu.gcj.runtime.endorsed.dirs");
 
diff --git a/libjava/gnu/gcj/runtime/HelperClassLoader.java b/libjava/gnu/gcj/runtime/HelperClassLoader.java
index 9b81b522ffa..3b48da17c5c 100644
--- a/libjava/gnu/gcj/runtime/HelperClassLoader.java
+++ b/libjava/gnu/gcj/runtime/HelperClassLoader.java
@@ -25,6 +25,11 @@ class HelperClassLoader extends URLClassLoader
   {
     super(new URL[0]);
   }
+  
+  HelperClassLoader(ClassLoader parent)
+  {
+    super(new URL[0], parent);
+  }
 
   /**
    * This is a helper method that adds all the jar and zip files from