diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7c388dac8e8..c6c6205f114 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-14  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* gij.cc (version): Properly quote java version.
+	(main): Fix typo in comment.
+
 2005-04-13  Mark Wielaard  <mark@klomp.org>
 
 	* java/lang/natRuntime.cc (insertSystemProperties): Set
diff --git a/libjava/gij.cc b/libjava/gij.cc
index 6eee6b5a40a..010e72fb5fc 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -40,7 +40,7 @@ help ()
 static void
 version ()
 {
-  printf ("java version " JV_VERSION "\n");
+  printf ("java version \"" JV_VERSION "\"\n");
   printf ("gij (GNU libgcj) version %s\n\n", __VERSION__);
   printf ("Copyright (C) 2005 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.  There is NO\n");
@@ -315,7 +315,7 @@ main (int argc, char const** argv)
     }
 
   // -jar mode overrides all other modes of specifying class path:
-  // -CLASSPATH, -Djava.class.path, -classpath and -cp.
+  // CLASSPATH, -Djava.class.path, -classpath and -cp.
   if (jar_mode)
     {
       char* darg = (char*) JvMalloc (strlen (argv[i])