diff --git a/ChangeLog b/ChangeLog
index a7f31d1d..b7ced133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+Changes between v2.8.4 and v2.8.5:
+----------------------------------
+
+Benno Schulenberg (35):
+ bindings: in the tiny version exclude word jumping from the prompts
+ bump version numbers and add a news item for the 2.8.5 release
+ display: don't let a SIGCONT write anything to the screen
+ display: don't show the cursor while we are busy calculating its position
+ display: redraw title bar and edit window only when needed
+ display: show the cursor position also when searching took a while
+ docs: avoid a double "see" for cross references in the HTML manual
+ docs: spell "title bar" and "status bar" correctly
+ gnulib: update to its current state
+ input: give an appropriate message when there are too many errors
+ startup: allow negative line and column numbers on the command line
+ startup: allow positioning the cursor also when reading standard input
+ startup: always open with the file that was mentioned first
+ startup: don't crash when opening standard input would fail
+ startup: don't mark the buffer as modified when in view mode
+ startup: don't mark the buffer as modified when nothing was read
+ startup: don't try placing the cursor when reading standard input failed
+ startup: don't use position history when reading from standard input
+ suspension: fake a SIGWINCH when coming back out of the background
+ suspension: remove a duplicate setting of the HUP and TERM handler
+ syntax: default: allow leading whitespace before a hash comment
+ tweaks: adjust indentation after preceding changes
+ tweaks: avoid compiler warning about implicit type
+ tweaks: be consistent in the spelling of title bar and status bar
+ tweaks: don't bother calculating the position when we won't show it
+ tweaks: elide a function that should not be a separate one
+ tweaks: elide a variable
+ tweaks: frob a few comments, and elide and #ifndef
+ tweaks: reduce the scope of three variables, and rename them besides
+ tweaks: reduce the scope of two variables, and rename them too
+ tweaks: rename a function and a variable, to better match what they do
+ tweaks: rename a variable, and frob a couple of comments
+ tweaks: rename two functions and a variable, and invert its logic
+ tweaks: reshuffle some stuff, to put related things closer together
+ tweaks: unglobalize the nodelay_mode variable
+
+
Changes between v2.8.3 and v2.8.4:
----------------------------------
diff --git a/NEWS b/NEWS
index 3a68a899..18ff2f55 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+2017.06.25 - GNU nano 2.8.5 "Farouche" avoids a crash when waking from
+ a suspension that was induced from the outside, allows
+ negative line and column numbers on the command line,
+ avoids some flickering when resizing the screen while
+ in the file browser, opens files in the order they were
+ mentioned on the command line, and does not pretend to
+ have woken from suspension when receiving a SIGCONT.
+
2017.05.21 - GNU nano 2.8.4 includes the nanorc man page again.
2017.05.18 - GNU nano 2.8.3 "Hirsch" fixes a misplacement of the spotlight
diff --git a/configure.ac b/configure.ac
index 690627e2..f973763e 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.8.4], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.8.5], [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 4f86b738..044dcbd0 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -83,7 +83,7 @@
1.3. Why the name change from TIP?
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).
1.4. What is the current version of nano?
-The current version of nano should be 2.8.4. Of course, you should always check the nano homepage to see what the latest and greatest version is.
+The current version of nano should be 2.8.5. Of course, you should always check the nano homepage to see what the latest and greatest version is.
1.5. I want to read the man page without having to download the program!
Jeez, demanding, aren't we? Okay, look here.
diff --git a/doc/nano.1 b/doc/nano.1
index 41f0a331..ab6092ce 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" .
.\"
-.TH NANO 1 "version 2.8.4" "May 2017"
+.TH NANO 1 "version 2.8.5" "June 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/nano.texi b/doc/nano.texi
index a286fd19..31c9c66f 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -6,8 +6,8 @@
@smallbook
@set EDITION 0.4
-@set VERSION 2.8.4
-@set UPDATED May 2017
+@set VERSION 2.8.5
+@set UPDATED June 2017
@dircategory Editors
@direntry
@@ -21,7 +21,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor
-@subtitle version 2.8.4
+@subtitle version 2.8.5
@author Chris Allegretta
@page
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 1b1cc64c..665c2b62 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" .
.\"
-.TH NANORC 5 "version 2.8.4" "May 2017"
+.TH NANORC 5 "version 2.8.5" "June 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/rnano.1 b/doc/rnano.1
index 8db7a8b3..a2cdb201 100644
--- a/doc/rnano.1
+++ b/doc/rnano.1
@@ -16,7 +16,7 @@
.\" Documentation License along with this program. If not, see
.\" .
.\"
-.TH RNANO 1 "version 2.8.4" "May 2017"
+.TH RNANO 1 "version 2.8.5" "June 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME