diff --git a/doc/nano.texi b/doc/nano.texi
index 38147d6b..9ff63d05 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -736,6 +736,9 @@ punctuation (see @code{set punct}), optionally followed by the specified
 closing brackets, can end sentences.  The default value is
 @t{""')>]@}"}.
 
+@item set breaklonglines
+Automatically hard-wrap the current line when it becomes overlong.
+
 @item set casesensitive
 Do case-sensitive searches by default.
 
@@ -746,10 +749,16 @@ Note that this overrides @option{quickblank}.
 @item set cutfromcursor
 Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
 
+@item set emptyline
+Do not use the line below the title bar, leaving it entirely blank.
+
 @item set errorcolor @var{fgcolor},@var{bgcolor}
 Use this color combination for the status bar when an error message is displayed.
 @xref{@code{set functioncolor}} for valid color names.
 
+@item set finalnewline
+If the buffer is not empty, ensure that it ends with a newline character.
+
 @item set fill @var{number}
 Set the target width for justifying and automatic hard-wrapping at this
 @var{number} of columns.  If the value is 0 or less, wrapping will occur
@@ -772,6 +781,9 @@ And either @var{fgcolor} or ,@var{bgcolor} may be left out.
 Save the last hundred search strings and replacement strings and
 executed commands, so they can be easily reused in later sessions.
 
+@item set jumpyscrolling
+Scroll the buffer contents per half-screen instead of per line.
+
 @item set keycolor @var{fgcolor},@var{bgcolor}
 Use this color combination for the shortcut key combos
 in the two help lines at the bottom of the screen.
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index b2a655e4..50008dcc 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -92,6 +92,9 @@ paragraphs.  This may not include blank characters.  Only closing
 punctuation (see \fBset punct\fP), optionally followed by the specified
 closing brackets, can end sentences.  The default value is "\fB"')>]}\fP".
 .TP
+.B set breaklonglines
+Automatically hard-wrap the current line when it becomes overlong.
+.TP
 .B set casesensitive
 Do case-sensitive searches by default.
 .TP
@@ -102,10 +105,16 @@ This overrides the option \fBquickblank\fR.
 .B set cutfromcursor
 Use cut-from-cursor-to-end-of-line by default, instead of cutting the whole line.
 .TP
+.B set emptyline
+Do not use the line below the title bar, leaving it entirely blank.
+.TP
 .B set errorcolor \fIfgcolor\fR,\fIbgcolor\fR
 Use this color combination for the status bar when an error message is displayed.
 See \fBset titlecolor\fR for valid color names.
 .TP
+.B set finalnewline
+If the buffer is not empty, ensure that it ends with a newline character.
+.TP
 .B set fill \fInumber\fR
 Set the target width for justifying and automatic hard-wrapping at this
 \fInumber\fR of columns.  If the value is 0 or less, wrapping will occur
@@ -122,6 +131,9 @@ See \fBset titlecolor\fR for more details.
 Save the last hundred search strings and replacement strings and
 executed commands, so they can be easily reused in later sessions.
 .TP
+.B set jumpyscrolling
+Scroll the buffer contents per half-screen instead of per line.
+.TP
 .B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
 Specify the color combination to use for the shortcut key combos
 in the two help lines at the bottom of the screen.
diff --git a/doc/sample.nanorc.in b/doc/sample.nanorc.in
index b64fa8fa..3d0b45f4 100644
--- a/doc/sample.nanorc.in
+++ b/doc/sample.nanorc.in
@@ -40,6 +40,9 @@
 ## optionally followed by these closing brackets, can end sentences.
 # set brackets ""')>]}"
 
+## Automatically hard-wrap the current line when it becomes overlong.
+# set breaklonglines
+
 ## Do case-sensitive searches by default.
 # set casesensitive
 
@@ -50,14 +53,23 @@
 ## Use cut-from-cursor-to-end-of-line by default.
 # set cutfromcursor
 
+## Do not use the line below the title bar, leaving it entirely blank.
+# set emptyline
+
 ## Enable hard-wrapping and set the target width, both for automatic
 ## line wrapping and for justifying paragraphs.  If the value is 0 or
 ## less, the wrapping point will be the screen width minus this number.
 # set fill -8
 
+## Ensure that a non-empty buffer ends with a newline character.
+# set finalnewline
+
 ## Remember the used search/replace strings for the next session.
 # set historylog
 
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
+
 ## Display line numbers to the left of the text.
 # set linenumbers