diff --git a/ChangeLog b/ChangeLog
index e1aabee0..96a7f4a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Changes between v3.0 and v3.1:
+------------------------------
+
+Benno Schulenberg (13):
+      bindings: bind ASCII DEL during startup instead of repeatedly at runtime
+      bindings: make ^H rebindable also on NetBSD, FreeBSD and macOS
+      bindings: when Ctrl+Shift+Delete has no keycode, don't use KEY_BSP
+      bump version numbers and add a news item for the 3.1 release
+      input: keep the cursor in edit window after message, also on NetBSD
+      input: recognize the sequences for Ctrl+Shift+Delete on xterm and urxvt
+      main: allow toggling all editor features when in view mode
+      suspension: don't try to show the cursor position when going to sleep
+      syntax: sh: let the header regex match also busybox shell scripts
+      tweaks: condense a bit of code
+      tweaks: remove a superfluous comment and a redundant assignment
+      tweaks: rename a variable to be special and distinct
+      tweaks: sharpen an optimization, to allow DEL to be a shortcut
+
+Liu Hao (1):
+      search: disallow switching to the Replace prompt when in view mode
+
 Changes between v2.9.8 and v3.0:
 --------------------------------
 
diff --git a/NEWS b/NEWS
index 0115a100..4e8c5ca3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2018.09.18 - GNU nano 3.1 "Je faisais des bonds comme ça!" fixes a
+             misbinding of ^H on some terminals and some systems,
+             does not leave stray stuff after the prompt upon exit
+             when having suspended nano while using --constantshow,
+             and does not allow to toggle to Replace in view mode.
+
 2018.09.09 - GNU nano 3.0 "Water Flowing Underground" speeds up the
              reading of a file by seventy percent, roughly doubles the
              speed of handling ASCII text, changes the way words at line
diff --git a/configure.ac b/configure.ac
index df5bf216..c9c3dece 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], [3.0], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [3.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 25e6b71a..ae8a9b07 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -91,7 +91,7 @@
 <h3><a name="1.3"></a>1.3. Why the name change from TIP?</h3>
 <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 &quot;establishes a full duplex terminal connection to a remote host&quot;, 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>
 <h3><a name="1.4"></a>1.4. What is the current version of nano?</h3>
-<blockquote><p>The current version of nano <i>should</i> be <b>3.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>3.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>
 <h3><a name="1.5"></a>1.5. I want to read the man page without having to download the program!</h3>
 <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 0feab78a..cac93c18 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 3.0" "September 2018"
+.TH NANO 1 "version 3.1" "September 2018"
 
 .SH NAME
 nano \- Nano's ANOther editor, an enhanced free Pico clone
diff --git a/doc/nano.texi b/doc/nano.texi
index 6a47094c..dfc2628d 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -8,7 +8,7 @@
 
 @smallbook
 @set EDITION 0.5
-@set VERSION 3.0
+@set VERSION 3.1
 @set UPDATED September 2018
 
 @dircategory Editors
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @command{nano}
 @subtitle a small and friendly text editor
-@subtitle version 3.0
+@subtitle version 3.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 3.0.
+This manual documents the GNU @command{nano} editor, version 3.1.
 
 @menu
 * Introduction::
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 3f0f42cb..12d23b24 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 3.0" "September 2018"
+.TH NANORC 5 "version 3.1" "September 2018"
 
 .SH NAME
 nanorc \- GNU nano's configuration file
diff --git a/doc/rnano.1 b/doc/rnano.1
index 5aa5428a..470069f7 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 3.0" "September 2018"
+.TH RNANO 1 "version 3.1" "September 2018"
 
 .SH NAME
 rnano \- a restricted nano
diff --git a/roll-a-release.sh b/roll-a-release.sh
index a39a5093..870e3540 100755
--- a/roll-a-release.sh
+++ b/roll-a-release.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-VERSION="3.0"
+VERSION="3.1"
 
-echo "Pulling..." &&  git pull &&
 echo "Running autogen..." &&  ./autogen.sh &&
 rm -v -f m4/*.m4~ *.asc *.sig *.gz *.xz &&