diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1602046731d..7c388dac8e8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-13  Mark Wielaard  <mark@klomp.org>
+
+	* java/lang/natRuntime.cc (insertSystemProperties): Set
+	java.class.path to CLASSPATH if not already set.
+
 2005-04-07  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* prims.cc (parse_verbose_args): Fix verbose argument parsing.
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index 0cdd7aca219..9ffeef7ad62 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -593,6 +593,18 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
       // LD_LIBRARY_PATH, etc.
       SET ("java.library.path", "");
     }
+
+  // If java.class.path is still not set then set it according to the
+  // CLASSPATH environment variable if given.  See gij.cc main () and
+  // prims.cc _Jv_CreateJavaVM () for all the ways this could have
+  // been set much earlier.
+  path = newprops->getProperty(JvNewStringLatin1("java.class.path"));
+  if (!path)
+    {
+      char *classpath = getenv("CLASSPATH");
+      if (classpath)
+	SET ("java.class.path", classpath);
+    }
 }
 
 java::lang::Process *