diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 093fc8fb089..60a0aef353d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-24  Bryce McKinlay  <mckinlay@redhat.com>
+
+        * gcj.texi (gij options): Add -Xss documentation.
+
 2005-11-08  Wil Mahan  <wmahan@gmail.com>
 
 	PR java/23617
diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index 142671eb852..21cc2a5770e 100644
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -1111,6 +1111,9 @@ Set the initial heap size.
 
 @item -Xmx@var{size}
 Set the maximum heap size.
+
+@item -Xss@var{size}
+Set the thread stack size.
 @end table
 
 Unrecognized @code{-X} options are ignored, for compatibility with
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9219f19c734..3701a4181bb 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-24  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* gij.cc (nonstandard_opts_help): Add entry for -Xss.
+
 2005-11-17  Mark Wielaard  <mark@klomp.org>
 
 	Imported GNU Classpath gcj-import-20051117.
diff --git a/libjava/gij.cc b/libjava/gij.cc
index 7c8d8b4222b..44adea26e74 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -52,6 +52,7 @@ nonstandard_opts_help ()
 {
   printf ("  -Xms<size>         set initial heap size\n");
   printf ("  -Xmx<size>         set maximum heap size\n");
+  printf ("  -Xss<size>         set thread stack size\n");
   exit (0);
 }