diff --git a/ChangeLog b/ChangeLog
index 752e0920fe86ef6dbac1a8f107eb12597c47f266..d8a69c9183d4a660a0ac736d22c99df9b035c010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+Changes between v2.8.1 and v2.8.2:
+----------------------------------
+
+Benno Schulenberg (64):
+ bindings: allow using <Backspace> to scroll back up in the help viewer
+ bindings: allow using '/' to start a search in the help viewer
+ bindings: show Home and End in browser help text, instead of M-| and M-?
+ browser: make ^End work properly by fixing a paste error
+ build: make --enable-help properly depend on --enable-multibuffer
+ bump version numbers and add a news item for the 2.8.2 release
+ display: initialize the colors only when starting to draw the content
+ display: push the titlebar to the screen as soon as it has been drawn
+ docs: add an item to the FAQ, about pasting from Windows to a remote nano
+ docs: harmonize the nanorc man page and Info document a bit
+ docs: in the FAQ, extend the answer to the pasting problem
+ docs: reword the main paragraph of the man page
+ docs: update the list of who authored what
+ gnulib: update to its current state in git
+ help: after a search, show the cursor only when something was found
+ help: allocate enough space for the descriptions, so we don't crash
+ help: don't crash when nano was started with --noread
+ help: don't cycle forward in the buffers when exiting from help
+ help: keep the same position also after M-\ or M-/ has been used
+ help: keep the text at the same position when the screen is resized
+ help: remove the final blank line, so <End> does the same as all <Down>
+ help: set tabsize to the default width while showing a help text
+ help: suppress nano's name and number to make it clearer this is help
+ help: use a dedicated syntax to color shortcuts in a help text
+ help: when searching, do it forward, without case, and without regexes
+ input: avoid crashing when resizing the window during verbatim input
+ options: allow -U (--quickblank) to be used in the tiny version
+ scrolling: don't bother to limit the number of lines to step back
+ startup: warn about a strange character size only in the UTF-8 case
+ syntax: nanohelp: change the hue of the keystrokes to match sample.nanorc
+ tweaks: add a warning for a condition that should never occur
+ tweaks: add three warnings for conditions that should never occur
+ tweaks: avoid an unused-variable warning
+ tweaks: be more precise about what --disable-extra does
+ tweaks: check for an empty needle in a central place
+ tweaks: complete the exclusion of backups and such from the tiny version
+ tweaks: condense two bits of code, and drop two asserts
+ tweaks: distinguish (in the comments) between buffers and linestructs
+ tweaks: drop a bunch of asserts
+ tweaks: elide a function that is used just once
+ tweaks: fix compilation with --enable-tiny --enable-color --enable-speller
+ tweaks: fix two typos
+ tweaks: remove a superfluous check
+ tweaks: remove a superfluous strlen() call from the reverse searches
+ tweaks: remove some superfluous placements of the cursor
+ tweaks: remove two superfluous calls of wnoutrefresh()
+ tweaks: rename a constant, to match the corresponding option
+ tweaks: rename a function, to be more accurate
+ tweaks: rename a function, to better suit what it does
+ tweaks: rename another function, to better describe what it does
+ tweaks: rename a parameter, to be more imperative
+ tweaks: rename a variable, use a faster comparison, and reshuffle a bit
+ tweaks: rename one variable again
+ tweaks: rename some more of these 'rev_start' variables
+ tweaks: rename three variables, elide another, and reshuffle some stuff
+ tweaks: rename two variables, because this 'rev_start' is irksome
+ tweaks: reshuffle a couple of lines to avoid a duplicate call
+ tweaks: reshuffle help-text initialization, to elide a save-and-restore
+ tweaks: reshuffle some more stuff, and rename two more variables
+ tweaks: swap the names of two variables, to make more sense
+ tweaks: transform the token DISABLE_MOUSE to ENABLE_MOUSE
+ tweaks: transform the token DISABLE_MULTIBUFFER to ENABLE_MULTIBUFFER
+ tweaks: use the logic from revstrstr() also in mbrevstrcasestr()
+ tweaks: use the logic from revstrstr() also in revstrcasestr()
+
+David Lawrence Ramsey (1):
+ docs: mention that also numbercolor overrides boldtext
+
+Rishabh Dave (1):
+ new feature: add a search facility to the help viewer
+
+
Changes between v2.8.0 and v2.8.1:
----------------------------------
diff --git a/NEWS b/NEWS
index e22ca1397eb9c6800ae68f9a9321a4927f8823a5..af099431a4cae4a045df526f823161643f7aacaf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+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
+ of verbatim input, avoids an unlikely crash when used
+ without UTF-8 support in some locales, avoids redrawing
+ the screen twice when switching between buffers while
+ line numbers are active, and works around a coloring
+ bug on musl. Plus tweaks to the documentation; plus
+ translation updates for fifteen languages.
+
2017.04.12 - GNU nano 2.8.1 "Ellert" fixes build failures on MacOS and
on musl, fixes scrolling problems in softwrap mode when
double-width characters on row boundaries are involved,
diff --git a/configure.ac b/configure.ac
index 8c8df4b0cd930a7106790dc5d96c143374ae4a1b..69561d786dc8372dde80f2830a0896da4a7d4b45 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.1], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.8.2], [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 0750f9d58c5cb583df5e5e157296cd90dd158e7a..b70346ba7bcb66b83bba5351e3686d7390b98b22 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.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>
+<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>
<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 dbff4870848ce2e2adb748c8ed077048abf92e4d..66764dbb35aabc94aa5a0ff7fb6a29d18efda464 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.1" "April 2017"
+.TH NANO 1 "version 2.8.2" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/nano.texi b/doc/nano.texi
index 9aa3cc472454d24f4d1d06ea21ee8dd9fcc2752a..2c555c9f595b45ead86e3876f04638ed3d299ae2 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -6,8 +6,8 @@
@smallbook
@set EDITION 0.4
-@set VERSION 2.8.1
-@set UPDATED April 2017
+@set VERSION 2.8.2
+@set UPDATED May 2017
@dircategory Editors
@direntry
@@ -21,7 +21,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor
-@subtitle version 2.8.1
+@subtitle version 2.8.2
@author Chris Allegretta
@page
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 27a83489a6f972fc25113af277052f0f3e1c9a02..4d128aa6c18b458d854fbd73331650f945341a3f 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.1" "April 2017"
+.TH NANORC 5 "version 2.8.2" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/rnano.1 b/doc/rnano.1
index 85a6836de41b73fc5c8288c096a9df9cad40b2f2..ceed1e0838c4fc973a4de029ee7d9ef378f5dffc 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.1" "April 2017"
+.TH RNANO 1 "version 2.8.2" "May 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME