diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a320abb1b34..a2ec2e5b34c 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-13  Tom Tromey  <tromey@redhat.com>
+
+	* gcj.texi (Invoking gij): Document -X and -?.
+
 2003-08-13  Mohan Embar  <gnustuff@thisiscool.com>
 
 	* Make-lang.in: Added missing win32-host.o to JAVA_OBJS,
diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index fa739220357..edce0929e4f 100644
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -778,7 +778,8 @@ gij [@option{-jar}] [@option{OPTION}] @dots{} @var{CLASS} [@var{ARGS}@dots{}]
   [@option{-cp} @var{path}] [@option{-classpath} @var{path}]
   [@option{-D}@var{name}[=@var{value}]@dots{}]
   [@option{-ms=}@var{number}] [@option{-mx=}@var{number}]
-  [@option{--showversion}] [@option{--version}] [@option{--help}]
+  [@option{-X@var{argument}]
+  [@option{--showversion}] [@option{--version}] [@option{--help}][@option{-?}]
 @c man end
 @c man begin SEEALSO gij
 gcc(1), gcj(1), gcjh(1), jv-scan(1), jcf-dump(1), gfdl(7),
@@ -838,11 +839,18 @@ This sets the initial heap size.
 @item -mx=@var{number}
 This sets the maximum heap size.
 
+@item -X
+@itemx -X@var{argument}
+Supplying @code{-X} by itself will cause @code{gij} to list all the
+supported @code{-X} options.  Currently there are none.  Unrecognized
+@code{-X} options are ignored, for compatibility with other runtimes.
+
 @item -jar
 This indicates that the name passed to @code{gij} should be interpreted
 as the name of a jar file, not a class.
 
 @item --help
+@itemx -?
 Print help, then exit.
 
 @item --showversion