diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7395873dfb8e6c5ef6f7f33ef309f8662dbb225e..633db92d48d8b5b17addc75c0fe365d00cb71564 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-13  Tom Tromey  <tromey@redhat.com>
+
+	* gij.cc (help): Document -? and -X.
+
 2003-08-12  Graydon Hoare  <graydon@redhat.com>
 
 	* java/awt/Font.java: 
diff --git a/libjava/gij.cc b/libjava/gij.cc
index 59c2fe9a61a04da93d9e887377d650041b837fbf..3b0683de03e57d81b25ed1c07bd7072623e28796 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -31,7 +31,8 @@ help ()
   printf ("  --cp LIST         set class path\n");
   printf ("  --classpath LIST  set class path\n");
   printf ("  -DVAR=VAL         define property VAR with value VAL\n");
-  printf ("  --help            print this help, then exit\n");
+  printf ("  -?, --help        print this help, then exit\n");
+  printf ("  -X                print help on supported -X options, then exit\n");
   printf ("  --ms=NUMBER       set initial heap size\n");
   printf ("  --mx=NUMBER       set maximum heap size\n");
   printf ("  --showversion     print version number, then keep going\n");