diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cceea20f5ca..4c54034980c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-08  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/24587:
+	* gnu/classpath/SystemProperties.java: Set gnu.classpath.version.
+
 2005-11-08  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/23763.  From aeby@graeff.com.
diff --git a/libjava/gnu/classpath/SystemProperties.java b/libjava/gnu/classpath/SystemProperties.java
index 46a9e6b5d9a..001663f0b71 100644
--- a/libjava/gnu/classpath/SystemProperties.java
+++ b/libjava/gnu/classpath/SystemProperties.java
@@ -70,6 +70,9 @@ public class SystemProperties
   {
     insertSystemProperties(defaultProperties);
 
+    defaultProperties.put("gnu.classpath.version",
+                          Configuration.CLASSPATH_VERSION);
+
     // Set base URL if not already set.
     if (defaultProperties.get("gnu.classpath.home.url") == null)
       defaultProperties.put("gnu.classpath.home.url",