diff --git a/ChangeLog b/ChangeLog
index e8134114..752e0920 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+Changes between v2.8.0 and v2.8.1:
+----------------------------------
+
+Benno Schulenberg (33):
+ bindings: make ^Home and ^End go to top and tail of buffer
+ bindings: make ^Up/^Down go to first/last row in the file browser
+ bindings: use arrows instead of words to designate the cursor keys
+ bump version numbers and add a news item for the 2.8.1 release
+ copyright: update the year in --version, and use the standard hyphen
+ copyright: update the years, use ranges, and explain this usage
+ display: check the correct character for being double-width
+ display: with softwrap, show the cursor where the eye expects it
+ docs: correct an answer to a question in the FAQ
+ docs: mention another difference with Pico in the Info document
+ docs: remove the self-referencing stuff and the changelog from the FAQ
+ docs: trim the TODO file a bit, and put the more important items first
+ editing: avoid creating blank lines when using autoindent
+ files: check also for write errors when prepending, not just read errors
+ gnulib: update to current state
+ linting: treat a tab as one "column", not eight
+ linting: when no is said to a file, remove all corresponding entries
+ moving: when determining where we are on the screen, use placewewant
+ tweaks: adjust a couple of comments
+ tweaks: again use memory on the stack instead of malloc() and free()
+ tweaks: close the backup file also when we skip making a backup
+ tweaks: delete a function that hasn't been used since 2005
+ tweaks: delete unnecessary function prototypes
+ tweaks: elide a variable and a pair of braces
+ tweaks: fix some inconsistencies in an old Changelog
+ tweaks: fix two typos in the NEWS file
+ tweaks: group ^D and ^H together in the help lines
+ tweaks: keep the help text aligned, also with the narrow arrows
+ tweaks: put M-A before ^6, to look better above M-6 in the help lines
+ tweaks: put unshifted shortcuts ^6 and M-6 first, instead of ^^ and M-^
+ tweaks: reduce the number of additions that actual_x() performs
+ tweaks: replace a function call or a macro with a hard number
+ tweaks: use memory on the stack instead of calling malloc() and free()
+
+David Lawrence Ramsey (5):
+ bindings: use arrows instead of words for search history too
+ display: show '<' and '>' placeholders for characters that get split
+ input: support escape sequences for ^Home and ^End
+ scrolling: properly compensate for the onscreen chunks
+ tweaks: avoid a compilation warning
+
+Kamil Dudka (1):
+ backup: prevent a symlink attack by operating on the file descriptor
+
+Mike Frysinger (2):
+ configure: fix up word boundary regex logic now that we have gnulib
+ configure: ignore the REG_ENHANCED test when we use gnulib
+
+
Changes between v2.7.5 and v2.8.0:
----------------------------------
diff --git a/IMPROVEMENTS b/IMPROVEMENTS
index f447960f..eb840872 100644
--- a/IMPROVEMENTS
+++ b/IMPROVEMENTS
@@ -1,6 +1,11 @@
Improvements in GNU nano
========================
+Since 2.8.0:
+ - Ctrl+Home and Ctrl+End jump to start and end of file.
+ - In softwrap mode the cursor now moves per visual row instead of per
+ logical line, and the screen will scroll per row.
+
Since 2.7.0:
- The keystroke ^] to complete a fragment to an existing full word.
- The ability to display line numbers in front of the text (M-#).
diff --git a/NEWS b/NEWS
index 5b6ee27d..ac1bf722 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+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,
+ shows double-width characters as ">" and "<" when split
+ across two rows, moves the cursor more predictably (at
+ the cost of sometimes putting it on the second "half"
+ of a character), avoids creating lines that consist of
+ only blanks when using autoindent, makes ^Home and ^End
+ go to the start and end of the file (on terminals that
+ support those keystrokes), places the cursor better when
+ linting, lets the linter ask only once whether to open
+ an included file, and adds bindings for ^Up and ^Down
+ in the file browser. Don't sit on your hands.
+
2017.03.31 - GNU nano 2.8.0 "Axat" makes it easier to move around in
softwrapped lines: the Up and Down keys now step from
visual row to visual row instead of jumping between
diff --git a/configure.ac b/configure.ac
index a9bbea98..8b954857 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.0], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.8.1], [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 7d070825..1f8b8c6a 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -82,7 +82,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.0. 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.1. 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 2853a9a7..45a48160 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.0" "March 2017"
+.TH NANO 1 "version 2.8.1" "April 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/nano.texi b/doc/nano.texi
index 94fe90e1..7a5631d2 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -6,8 +6,8 @@
@smallbook
@set EDITION 0.4
-@set VERSION 2.8.0
-@set UPDATED March 2017
+@set VERSION 2.8.1
+@set UPDATED April 2017
@dircategory Editors
@direntry
@@ -20,8 +20,8 @@
@titlepage
@title GNU @code{nano}
-@subtitle a small and friendly text editor.
-@subtitle version 2.8.0
+@subtitle a small and friendly text editor
+@subtitle version 2.8.1
@author Chris Allegretta
@page
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 220f2e21..878218b1 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.0" "March 2017"
+.TH NANORC 5 "version 2.8.1" "April 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/rnano.1 b/doc/rnano.1
index c434a54a..85a6836d 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.0" "March 2017"
+.TH RNANO 1 "version 2.8.1" "April 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME