diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1241708f095b9577b4dbf8dd76e7a728abaf63d4..de7cae493facbed13da7c1356dd45b584c5962bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-11  Nick Clifton  <nickc@redhat.com>
+
+	PR target/5362
+	* config/fr30/fr30.opt: Document the -mno-lsim option.
+	* doc/invoke.texi: Add descriptions of the FR30's -msmall-model
+	and -mno-lsim options.
+
 2009-03-11  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* fold-const.c (fold_comparison): Only call fold_inf_compare
diff --git a/gcc/config/fr30/fr30.opt b/gcc/config/fr30/fr30.opt
index ac8567da1f3a71016b59ade65febc5dd716c3e41..da6148a6d2ba3ab153cdceb62023367456011dee 100644
--- a/gcc/config/fr30/fr30.opt
+++ b/gcc/config/fr30/fr30.opt
@@ -1,6 +1,6 @@
 ; Options for the FR30 port of the compiler.
 
-; Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+; Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
 ;
@@ -23,4 +23,5 @@ Target Report Mask(SMALL_MODEL)
 Assume small address space
 
 mno-lsim
-Target RejectNegative Undocumented
+Target RejectNegative
+Assume that run-time support has been provided, so omit -lsim from the linker command line
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 043cc980bb95a05e49dbd18eef8a295a27b654e1..7f9229d78ed7f8db3add79af0f0fbcc909c1b64a 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -525,6 +525,9 @@ Objective-C and Objective-C++ Dialects}.
 @emph{DEC Alpha/VMS Options}
 @gccoptlist{-mvms-return-codes}
 
+@emph{FR30 Options}
+@gccoptlist{-msmall-model -mno-lsim}
+
 @emph{FRV Options}
 @gccoptlist{-mgpr-32  -mgpr-64  -mfpr-32  -mfpr-64 @gol
 -mhard-float  -msoft-float @gol
@@ -8818,6 +8821,7 @@ platform.
 * Darwin Options::
 * DEC Alpha Options::
 * DEC Alpha/VMS Options::
+* FR30 Options::
 * FRV Options::
 * GNU/Linux Options::
 * H8/300 Options::
@@ -10250,6 +10254,28 @@ Return VMS condition codes from main.  The default is to return POSIX
 style condition (e.g.@: error) codes.
 @end table
 
+@node FR30 Options
+@subsection FR30 Options
+@cindex FR30 Options
+
+These options are defined specifically for the FR30 port.
+
+@table @gcctabopt
+
+@item -msmall-model
+@opindex msmall-model
+Use the small address space model.  This can produce smaller code, but
+it does assume that all symbolic values and addresses will fit into a
+20-bit range.
+
+@item -mno-lsim
+@opindex mno-lsim
+Assume that run-time support has been provided and so there is no need
+to include the simulator library (@file{libsim.a}) on the linker
+command line.
+
+@end table
+
 @node FRV Options
 @subsection FRV Options
 @cindex FRV Options