diff --git a/ChangeLog b/ChangeLog
index 52269f893987e34e4080a8d27512e787baa6c853..dd3e089257a90be5347ace5497194d21326108fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,97 @@
+Changes between v2.7.4 and v2.7.5:
+----------------------------------
+
+Benno Schulenberg (65):
+ bump version numbers and add a news item for the 2.7.5 release
+ files: leave out the confusing "[from ./]" when prompting for a command
+ general: stop the spell checker from crashing after the changes in search
+ justify: reduce the character count when trimming trailing spaces
+ painting: account for index maybe being zero after the preceding change
+ painting: advance only when both start /and/ end match are zero-length
+ painting: do not bluntly ignore zero-length start matches -- handle them
+ painting: do not let a match for 'end' overlap a match for 'start'
+ painting: don't look at the current multidata when coloring a line
+ painting: make use of the multidata of the preceding line
+ painting: mark an unpaired start match as CWOULDBE
+ painting: properly detect a change in start/end matches
+ painting: properly look for a new start match only after the end match
+ painting: stay within the line when skipping zero-length matches
+ painting: when skipping a zero-length match, skip a character, not a byte
+ rcfile: don't accept empty regexes for syntax coloring
+ replacing: compensate cursor position only for replacements /before/ it
+ replacing: detect when the whole region has already been covered
+ replacing: don't go outside of the selected region
+ replacing: ignore the first match when the user said no
+ replacing: start at the region's edge instead of one step before it
+ replacing: stop searching in a region when edge of buffer is reached
+ screen: don't compare a character index with a column position
+ screen: ehm... no, that was wrong: page_start /is/ a column position
+ search: begin from where we are, to be able to find the first \B
+ search: make the \b and \B anchors work correctly in both directions
+ spelling: correctly adjust the length of a single-line region
+ spelling: don't unnecessarily fiddle with the viewport
+ startup: report an error when the given line or column number is invalid
+ statusbar: display at most three consecutive alert messages
+ tweaks: adjust some comments, reshuffle a line, and use a while loop
+ tweaks: adjust two comments, to be more accurate
+ tweaks: adjust whitespace after preceding changes
+ tweaks: and rename another variable, to keep in style
+ tweaks: chuck some obscuring debugging stuff
+ tweaks: condense a comment, rename a variable, and use a while loop
+ tweaks: differentiate single-regex matches from paired-regex matches
+ tweaks: discard the now unused multidata-resetting routine
+ tweaks: elide a variable plus its corresponding dark logic
+ tweaks: fiddle with some wordings in the texinfo document
+ tweaks: free an option string also when it was invalid
+ tweaks: move a comment and rewrap a line
+ tweaks: normalize some paragraph formatting in the FAQ
+ tweaks: rearrange some code to separate softwrap and normal mode more
+ tweaks: rename a function, and drop an unneeded parameter
+ tweaks: rename a function, to show it refers to screen rows
+ tweaks: rename another variable, to be shorter
+ tweaks: rename a variable and condense an if
+ tweaks: rename a variable -- lines refers to buffer, rows to screen
+ tweaks: rename a variable, to be more general
+ tweaks: rename a variable, to be more general and match one elsewhere
+ tweaks: rename some variables, to better distinguish rows from lines
+ tweaks: rename some variables, to show they refer to screen rows
+ tweaks: rename two variables, and always pass a valid result back
+ tweaks: rename two variables, to avoid double negatives
+ tweaks: reshuffle an assignment and trim some comments
+ tweaks: reshuffle a test to a better place
+ tweaks: reshuffle three variables
+ tweaks: scrap a bunch of debugging lines -- they obscure the logic
+ tweaks: scrap some debugging stuff
+ tweaks: slightly speed up the change detection for multiline matches
+ tweaks: swap two blocks of code to reduce the number of #ifdefs
+ tweaks: update some copyright years
+ tweaks: use a cheaper way to detect an end-of-line
+ tweaks: use a subtraction instead of a counter
+
+David Lawrence Ramsey (16):
+ docs: mention the ability to read from stdin
+ screen: don't hide two-column characters at left edge in softwrap mode
+ tweaks: adjust and correct some comments
+ tweaks: always directly do a refresh when the margin changes
+ tweaks: do a comparison a bit differently in do_output() and do_deletion()
+ tweaks: fix compilation when configured with --enable-tiny
+ tweaks: improve comments and formatting in update_line()
+ tweaks: let update_line() return the correct value on error
+ tweaks: reduce duplicate code in new_magicline() and move_to_filestruct()
+ tweaks: rename a variable and adjust some types in edit_scroll()
+ tweaks: rename a variable in edit_redraw(), to make sense
+ tweaks: rename a variable in edit_scroll(), to make sense
+ tweaks: rename mouse_x & mouse_y to mouse_col & mouse_row in do_mouse()
+ tweaks: rename the functions for moving to and copying from a buffer
+ tweaks: rewrap two lines and fix two typos
+ tweaks: split the grafting code off from copy_from_buffer()
+
+Mike Frysinger (3):
+ syntax: c++: add override keyword
+ syntax: gentoo: flag mixed whitespace
+ syntax: gentoo: match .eblit files too
+
+
Changes between v2.7.3 and v2.7.4:
----------------------------------
diff --git a/NEWS b/NEWS
index 2be75c6346c1e15a8d2a6e5da690a043683eac28..b0b69051cfa0428b591becee7dc91d01ddc33afd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+2017.02.23 - GNU nano 2.7.5 "Nijntje" can properly search and replace
+ the \B and \b regex anchors, correctly repaints things
+ when multiline regexes with identical start and end are
+ involved, fixes a crash with zero-length regex matches,
+ does replacements at the edges of a marked region right,
+ no longer hides double-width characters at the head of
+ softwrapped rows, displays at most three warnings at
+ startup, and documents the ability to read a file from
+ standard input. Come tickle my ears.
+
2017.01.10 - GNU nano 2.7.4 "Red dress" undoes deletions in an orderly
manner again (bug was introduced in previous version),
sets the preferred x position for vertical movements
diff --git a/configure.ac b/configure.ac
index 6cd1d9ef56127019cb94bba209750ad42a8758d2..a1051c2311bd37d9955488038edf8a434fa7a13d 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.7.4], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.7.5], [nano-devel@gnu.org], [nano])
AC_CONFIG_SRCDIR([src/nano.c])
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE
diff --git a/doc/faq.html b/doc/faq.html
index 511b6adbbfe4d403d473ea125c6be19d44773160..06bae2ab03ebbdecc5e6881f4865dd3aa07ad06b 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -82,7 +82,7 @@
<h2><a name="1.5"></a>1.5. 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.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano <i>should</i> be <b>2.7.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>
+<blockquote><p>The current version of nano <i>should</i> be <b>2.7.5</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.7"></a>1.7. 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 4e6cdbffa02603d5e6a7130a0d6f7217ce7ce11f..a9cdf476bb1357530312e7b91b418b00e9e831b3 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -17,7 +17,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH NANO 1 "version 2.7.4" "January 2017"
+.TH NANO 1 "version 2.7.5" "February 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/nano.texi b/doc/nano.texi
index b2923f598f724d99adcd4b79b00ea3b6e30b70de..6159bd33f5150a37c27e13f8b4aa6dfe94ea00a9 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -6,8 +6,8 @@
@smallbook
@set EDITION 0.4
-@set VERSION 2.7.4
-@set UPDATED January 2017
+@set VERSION 2.7.5
+@set UPDATED February 2017
@dircategory Editors
@direntry
@@ -21,7 +21,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 2.7.4
+@subtitle version 2.7.5
@author Chris Allegretta
@page
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 66edf18da99253d6ec591d8422bf3647afb5b1e4..1dd50ca8d347f1ef751b39acf1bb55774cf0f732 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -17,7 +17,7 @@
.\" Documentation License along with this program. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH NANORC 5 "version 2.7.4" "January 2017"
+.TH NANORC 5 "version 2.7.5" "February 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
diff --git a/doc/rnano.1 b/doc/rnano.1
index 43734782058e4aa1b79d9e3fd570f78e409cd981..920e7e49ad4b62b1d6ffa479fa09f8bc28a50f73 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.7.4" "January 2017"
+.TH RNANO 1 "version 2.7.5" "February 2017"
.\" Please adjust this date whenever revising the manpage.
.SH NAME