diff --git a/ChangeLog b/ChangeLog
index cb06d764..f342c686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -256,12 +256,16 @@ CVS code -
 	- Remove now-inaccurate note about verbatim input's not working
 	  at prompts, and update its description to mention that it
 	  handles hexadecimal values now. (DLR)
-- doc/nanorc.sample:
+- nanorc.sample:
 	- Add return to the "c-file" regexes. (DLR)
 	- Clarify the text describing good values for whitespace
 	  display.  Since ASCII is technically only seven bits wide,
 	  characters 128-255 aren't ASCII. (DLR, suggested by Michael
 	  Piefel)
+	- Add the "morespace" option. (DLR)
+- nano.1. nanorc.5, nano.texi:
+	- Add the "morespace" option, and sync with the descriptions in
+	  nanorc.sample in a few places. (DLR)
 - src/Makefile.am:
 	- Add chars.c to nano_SOURCES. (DLR)
 	- If we're installing and the "rnano" symlink already exists,
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 65bd2015..e12717a5 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -69,6 +69,9 @@ if nanorc support is available.
 .B \-N (\-\-noconvert)
 Disable automatic conversion of files from DOS/Mac format.
 .TP
+.B \-O (\-\-morespace)
+Use the blank line below the titlebar as extra editing space.
+.TP
 .B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
 Set the quoting string for justifying.  The default is
 "^([\ \\t]*[|>:}#])+" if regular expression support is available, or
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index c0098101..f660b918 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -59,7 +59,7 @@ closing brackets, can end sentences.
 Constantly display the cursor position in the status bar.
 .TP
 \fBset/unset cut\fP
-Use cut to end of line with ^K by default.
+Use cut to end of line by default.
 .TP
 \fBset fill \fIn\fP\fP
 Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the line
@@ -70,6 +70,13 @@ Enable
 .I ~/.nano_history
 for saving and reading search/replace strings.
 .TP
+\fBset/unset morespace\fP
+Allow use of the blank line below the titlebar as extra editing space.
+.TP
+\fBset/unset mouse\fP
+Enable mouse support, so that mouse clicks can be used to set the mark
+and run shortcuts.
+.TP
 \fBset/unset multibuffer\fP
 Allow inserting files into their own buffers.
 .TP
@@ -132,7 +139,7 @@ Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
 \fBset/unset suspend\fP
-Allow nano to be suspended with ^Z.
+Allow nano to be suspended.
 .TP
 \fBset tabsize \fIn\fP\fP
 Use a tab size of \fIn\fP columns instead of the default (8); must be
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index a66d8987..7cd42d0f 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -38,8 +38,11 @@
 ## Enable ~/.nano_history for saving and reading search/replace strings.
 # set historylog
 
-## Enable mouse support so that mouse clicks can be used to set the mark
-## and run shortcuts.
+## Use the blank line below the titlebar as extra editing space.
+# set morespace
+
+## Enable mouse support, so that mouse clicks can be used to set the
+## mark and run shortcuts.
 # set mouse
 
 ## Allow multiple file buffers (inserting a file will put it into a
@@ -242,7 +245,7 @@
 ## highlight possible errors and parameters
 #color brightwhite "^ *(set|unset|syntax|color).*$"
 ## set, unset and syntax
-#color cyan "^ *(set|unset) +(autoindent|backup|backupdir|brackets|const|cut|fill|historylog|mouse|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|punct|quotestr|rebinddelete|regexp|smarthome|smooth|speller|suspend|tabsize|tempfile|view|whitespace)"
+#color cyan "^ *(set|unset) +(autoindent|backup|backupdir|brackets|const|cut|fill|historylog|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|punct|quotestr|rebinddelete|regexp|smarthome|smooth|speller|suspend|tabsize|tempfile|view|whitespace)"
 #color green "^ *(set|unset|syntax)\>"
 ## colors
 #color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index e92c51dd..63047316 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -342,13 +342,13 @@ The following global toggles are available:
 @item Backup File Toggle (Meta-B)
 toggles the -B (@code{--backup}) command line flag.
 
-@item Multiple Files Toggle (Meta-F)
+@item Multiple File Buffers Toggle (Meta-F)
 toggles the -F (@code{--multibuffer}) command line flag.
 
 @item Backup File Toggle (Meta-H)
 toggles the -A (@code{--smarthome}) command line flag.
 
-@item AutoIndent Toggle (Meta-I)
+@item Auto Indent Toggle (Meta-I)
 toggles the -i (@code{--autoindent}) command line flag.
 
 @item Cut To End Toggle (Meta-K)
@@ -360,6 +360,9 @@ toggles the -w (@code{--nowrap}) command line flag.
 @item Mouse Toggle (Meta-M)
 toggles the -m (@code{--mouse}) command line flag.
 
+@item More Space Toggle (Meta-O)
+toggles the -O (@code{--morespace}) command line flag.
+
 @item Smooth Scrolling Toggle (Meta-S)
 toggles the -S (@code{--smooth}) command line flag.