diff --git a/ChangeLog b/ChangeLog
index 67794b952bd990a8edf9812ed652db7ec1a352d8..77dacde6990fe6855088ea3885a505878302df3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Changes between v2.9.0 and v2.9.1:
+----------------------------------
+
+Benno Schulenberg (20):
+ build: fix compilation with --disable-browser --disable-tabcomp
+ bump version numbers and add a news item for the 2.9.1 release
+ files: always update the stat info when the entire file is written
+ files: save the marked region only when we've prompted for a file name
+ gnulib: update to its current upstream state
+ history: create the path '~/.local/share/' when it is needed
+ history: make nano's state directory accessible for the user only
+ history: save the positions file also when a record was deleted
+ input: make the macro key discoverable by giving feedback when undefined
+ linting: switch the mark off when the linter starts
+ selecting: do not cancel the softmark when the cursor is not moved
+ selecting: let a justification cancel a softmark
+ syntax: adjust the magic strings for the changes since file-5.10
+ tweaks: adjust indentation after previous change
+ tweaks: elide the 'mark_set' boolean -- the 'mark' pointer is enough
+ tweaks: rename, rewrap, and reshuffle some stuff, and frob some comments
+ tweaks: reshuffle a couple of lines, and frob a comment or two
+ tweaks: reshuffle a couple of lines, to put similar things together
+ undo: clear the Modified state when the very first edit is undone
+ undo: discarding the stack does not always lose information
+
+
Changes between v2.8.7 and v2.9.0:
----------------------------------
diff --git a/NEWS b/NEWS
index 5604c654506f4992a3ab86a4e201f4c7f2fec83c..93feb55f437ca613ed3c0c0a283c34c6bbf40360 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2017.11.27 - GNU nano 2.9.1 "Damyatta" fixes a bug where, when the mark
+ is on, ^S would overwrite the file with just the marked
+ region. This release further clears the "Modified" flag
+ when all edits are undone, adds or updates some magic
+ strings, and does not forget when the cursor was last
+ at line 1, column 1.
+
2017.11.18 - GNU nano 2.9.0 "Eta" introduces the ability to record and
replay keystrokes (M-: to start and stop recording, M-;
to play the macro back), makes ^Q and ^S do something
diff --git a/configure.ac b/configure.ac
index 0da078d3f02f675d5818b0e84ae9c911fe9bb9aa..03079964291390e012269be888070dd5b6f551db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
-AC_INIT([GNU nano], [2.9.0], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.9.1], [nano-devel@gnu.org], [nano])
AC_CONFIG_SRCDIR([src/nano.c])
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([1.14])
diff --git a/doc/faq.html b/doc/faq.html
index b7c049c5d237e8d3516ee641e1b1adb64135883d..159951a5ae055e6e5230fee65d7526771d232d67 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -83,7 +83,7 @@
<h2><a name="1.3"></a>1.3. Why the name change from TIP?</h2>
<blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
<h2><a name="1.4"></a>1.4. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.9.0</b>. Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano <i>should</i> be <b>2.9.1</b>. Of course, you should always check the <a href="https://nano-editor.org/">nano homepage</a> to see what the latest and greatest version is.</p></blockquote>
<h2><a name="1.5"></a>1.5. I want to read the man page without having to download the program!</h2>
<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="https://nano-editor.org/dist/latest/nano.1.html">here</a>.</p></blockquote>
<hr width="100%">
diff --git a/doc/nano.1 b/doc/nano.1
index 12443c86ab2606be98fad6fb63cbdcb6ffeb6ab9..fbfc4453f62bdaa86861c53b7e1fad1789c42830 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH NANO 1 "version 2.9.0" "November 2017"
+.TH NANO 1 "version 2.9.1" "November 2017"
.SH NAME
nano \- Nano's ANOther editor, an enhanced free Pico clone
diff --git a/doc/nano.texi b/doc/nano.texi
index 4714ac0b72c8beea147070f995d81089f68fb1de..ac6149114c5aae3d56f3b46b46b0a35b085ccd95 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -8,7 +8,7 @@
@smallbook
@set EDITION 0.5
-@set VERSION 2.9.0
+@set VERSION 2.9.1
@set UPDATED November 2017
@dircategory Editors
@@ -23,7 +23,7 @@
@titlepage
@title GNU @command{nano}
@subtitle a small and friendly text editor
-@subtitle version 2.9.0
+@subtitle version 2.9.1
@author Chris Allegretta
@page
@@ -63,7 +63,7 @@ e-mail: @email{chrisa@@asty.org}@*
@node Top
@top
-This manual documents the GNU @command{nano} editor, version 2.9.0.
+This manual documents the GNU @command{nano} editor, version 2.9.1.
@menu
* Introduction::
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 3e4b0e5af9288515c2a616e7e569b96a2f6d19ed..25277a5e1f70fd3d983d2c2448da5cc2abac5c6a 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH NANORC 5 "version 2.9.0" "November 2017"
+.TH NANORC 5 "version 2.9.1" "November 2017"
.SH NAME
nanorc \- GNU nano's configuration file
diff --git a/doc/rnano.1 b/doc/rnano.1
index 2cd2e3dea1a78011d86f23e50a2962a222e9d166..40cbec64fed48c76121d2c91e9b5a77d9aef8c2b 100644
--- a/doc/rnano.1
+++ b/doc/rnano.1
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH RNANO 1 "version 2.9.0" "November 2017"
+.TH RNANO 1 "version 2.9.1" "November 2017"
.SH NAME
rnano \- a restricted nano