diff --git a/ChangeLog b/ChangeLog
index d8a69c9183d4a660a0ac736d22c99df9b035c010..05fd6f7b86bda736b3aa6ddd21d47682a3f4c559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+Changes between v2.8.2 and v2.8.3:
+----------------------------------
+
+Benno Schulenberg (34):
+ bindings: allow toggling a new buffer when multiple buffers are enabled
+ build: don't use a dummy dependency, as it breaks non-GNU makes
+ build: for Solaris, tell the linker where to find clock_gettime()
+ build: use backticks to avoid a warning during autoreconf
+ build: use the "force" mechanism to always run the revision rule
+ bump version numbers and add a news item for the 2.8.3 release
+ chars: optimize moving a character left in the non-UTF-8 case
+ chars: probe for a valid UTF-8 starter byte, instead of overstepping
+ chars: valid UTF-8 codes are at most 4 bytes long, so look only that far
+ display: keep the cursor put, also when toggling nohelp or morespace
+ files: don't ask "save anyway" when user orders to discard the buffer
+ history: don't save the cursor position for temporary help files
+ moving: limit the target column when it is beyond the last chunk
+ replacing: don't let placewewant influence the placement of the cursor
+ startup: don't call delwin() with NULL, to avoid crashing on Solaris
+ syntax: makefile: color comments only at start of line or after whitespace
+ syntax: nanohelp: color also ^6 as a shortcut keystroke
+ syntax: php: color also variable names, and color more reserved words
+ syntax: php: recognize also the .phtml and .php7 extensions
+ syntax: xml: recognize an XML file also by its first line
+ tweaks: add another warning for an impossible condition
+ tweaks: adjust whitespace and comments after the preceding change
+ tweaks: avoid an empty function call in tiny version with line numbers
+ tweaks: exclude from the tiny version five error-betraying messages
+ tweaks: exclude from the tiny version two messages that will never occur
+ tweaks: fix compilation with --enable-tiny ...-help and ...-multibuffer
+ tweaks: remove an old fault-catching message
+ tweaks: remove five dummy function definitions from the tiny version
+ tweaks: rename three empty functions, and reshuffle some others
+ tweaks: rewrap a couple of old items in NEWS, and fix an article
+ tweaks: swap a comparison, to be clearer
+ tweaks: transform the token DISABLE_BROWSER to ENABLE_BROWSER
+ tweaks: transform the token DISABLE_NANORC to ENABLE_NANORC
+ tweaks: transform the token DISABLE_TABCOMP to ENABLE_TABCOMP
+
+David Lawrence Ramsey (2):
+ display: ensure smooth scrolling when the edit window is resized
+ tweaks: fix several whitespace irregularities
+
+
Changes between v2.8.1 and v2.8.2:
----------------------------------
diff --git a/NEWS b/NEWS
index 390a6d02d257cf794622e56c716860265d70697b..fd527d39585351c392dbc5c88f33f2564b4fe13d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+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
+ searching, improves PHP syntax highlighting, and no longer
+ asks “save anyway?†when the user ^Q discards the buffer.
+
2017.05.04 - GNU nano 2.8.2 "Krats" adds another new feature: it makes
the ^G help texts searchable with ^W. Apart from that,
it fixes a crash when resizing the window in the middle
diff --git a/configure.ac b/configure.ac
index 7b4f72f345765eb9d3918a5d3bef0982ef614744..586324c3a1a73ff0d8a7eda7b702e7099d4e19d1 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.2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.8.3], [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 b70346ba7bcb66b83bba5351e3686d7390b98b22..2daebcea3e15c439781446906ea421165a62fd18 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.2</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.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>
<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 66764dbb35aabc94aa5a0ff7fb6a29d18efda464..380a1afd2a99858a63aee851756162e4f4670b21 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.2" "May 2017"
+.TH NANO 1 "version 2.8.3" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/nano.texi b/doc/nano.texi
index 2c555c9f595b45ead86e3876f04638ed3d299ae2..f10aaa0f0111e32586163311333867f81c0a8292 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -6,7 +6,7 @@
@smallbook
@set EDITION 0.4
-@set VERSION 2.8.2
+@set VERSION 2.8.3
@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.2
+@subtitle version 2.8.3
@author Chris Allegretta
@page
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 4d128aa6c18b458d854fbd73331650f945341a3f..6217d1a814a27da46a782027b2884487e6479665 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.2" "May 2017"
+.TH NANORC 5 "version 2.8.3" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/rnano.1 b/doc/rnano.1
index ceed1e0838c4fc973a4de029ee7d9ef378f5dffc..c9e821328097f6952438238bc0471dd15fb807f8 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.2" "May 2017"
+.TH RNANO 1 "version 2.8.3" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME