diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 12b892fd9cd..afa68cecb72 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-09  Tom Tromey  <tromey@redhat.com>
 
+	* gnu/gcj/convert/Convert.java (version): Use java.vm.name
+	property.
+	(help, version): Use println(), not println("").
+
 	For PR libgcj/5303:
 	* gnu/gcj/convert/Convert.java (error): Program is called
 	`jv-convert'.  Print GNU-style message.  Exit with status 1, not
diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java
index 36fe6b5443a..fe18a67c97f 100644
--- a/libjava/gnu/gcj/convert/Convert.java
+++ b/libjava/gnu/gcj/convert/Convert.java
@@ -22,9 +22,9 @@ public class Convert
   static void help ()
   {
     System.out.println("Usage: jv-convert [OPTIONS] [INPUTFILE [OUTPUTFILE]]");
-    System.out.println("");
+    System.out.println();
     System.out.println("Convert from one encoding to another.");
-    System.out.println("");
+    System.out.println();
     System.out.println("   --encoding FROM");
     System.out.println("   --from FROM        use FROM as source encoding name");
     System.out.println("   --to TO            use TO as target encoding name");
@@ -33,16 +33,18 @@ public class Convert
     System.out.println("   --reverse          swap FROM and TO encodings");
     System.out.println("   --help             print this help, then exit");
     System.out.println("   --version          print version number, then exit");
-    System.out.println("");
+    System.out.println();
     System.out.println("`-' as a file name argument can be used to refer to stdin or stdout.");
     System.exit(0);
   }
 
   static void version ()
   {
-    System.out.println("jv-convert (GNU libgcj) "
+    System.out.println("jv-convert (GNU "
+		       + System.getProperty("java.vm.name")
+		       + ") "
 		       + System.getProperty("java.vm.version"));
-    System.out.println("");
+    System.out.println();
     System.out.println("Copyright 1999, 2002 Free Software Foundation");
     System.out.println("This is free software; see the source for copying conditions.  There is NO");
     System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");