diff --git a/ChangeLog b/ChangeLog
index 05fd6f7b86bda736b3aa6ddd21d47682a3f4c559..a7f31d1d634e4f30f5f707596908b38f26cf6614 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 fd527d39585351c392dbc5c88f33f2564b4fe13d..3a68a899745a1d21a26ed8784c2b6629d4b0d996 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 49054228c0a7604ad2dffbdf1078c430e10da42f..690627e26d762894813faac32dedd5948e92265b 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 2daebcea3e15c439781446906ea421165a62fd18..2a0dbce8330afb274c5650f6832a330e19b60638 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.8.3</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.8.4</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 380a1afd2a99858a63aee851756162e4f4670b21..fbd46f8cf194ef4c62e86d74de70bfb5c15e10bb 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.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 7a283e1c6d4028643623b58b563c76539ee72c8f..7bb34b115670febae43a284f997cf181ecd7d120 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 6217d1a814a27da46a782027b2884487e6479665..4832cfb61681a222a50ef9ef8d61e0cf0f35188d 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.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 c9e821328097f6952438238bc0471dd15fb807f8..8db7a8b3034bd23ecebf0a96562aa49799bf2f65 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.8.3" "May 2017"
+.TH RNANO 1 "version 2.8.4" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME