diff --git a/ChangeLog b/ChangeLog
index 05fd6f7b..a7f31d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Changes between v2.8.3 and v2.8.4:
+----------------------------------
+
+Benno Schulenberg (11):
+ build: correct the inverted logic for the nanorc man page
+ bump version numbers and add a news item for the 2.8.4 release
+ gnulib: update to its current state
+ syntax: default: color also hash comments and email addresses
+ syntax: php: color "static" again as "function", like it used to be
+ tweaks: adjust the indentation after the preceding change
+ tweaks: avoid an unused-variable warning when using --disable-comment
+ tweaks: do actual screen refreshes in a single call, when possible
+ tweaks: remove the no-op x$disable tests
+ tweaks: reorder three items in the Info document
+ tweaks: reshuffle a few things to reduce duplication
+
+
Changes between v2.8.2 and v2.8.3:
----------------------------------
diff --git a/NEWS b/NEWS
index fd527d39..3a68a899 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+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
during interactive replacing, avoids build failures on AIX
and Solaris, fixes a crash on Solaris, speeds up backwards
diff --git a/configure.ac b/configure.ac
index 49054228..690627e2 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.3], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.8.4], [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 2daebcea..2a0dbce8 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.3. 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.4. 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 380a1afd..fbd46f8c 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.3" "May 2017"
+.TH NANO 1 "version 2.8.4" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/nano.texi b/doc/nano.texi
index 7a283e1c..7bb34b11 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -6,7 +6,7 @@
@smallbook
@set EDITION 0.4
-@set VERSION 2.8.3
+@set VERSION 2.8.4
@set UPDATED May 2017
@dircategory Editors
@@ -21,7 +21,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor
-@subtitle version 2.8.3
+@subtitle version 2.8.4
@author Chris Allegretta
@page
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 6217d1a8..4832cfb6 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.3" "May 2017"
+.TH NANORC 5 "version 2.8.4" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/rnano.1 b/doc/rnano.1
index c9e82132..8db7a8b3 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.3" "May 2017"
+.TH RNANO 1 "version 2.8.4" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME