diff --git a/ChangeLog b/ChangeLog
index 70525fc1..e6566729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+Changes between v6.3 and v6.4:
+------------------------------
+
+Benno Schulenberg (24):
+ bump version numbers and add a news item for the 6.4 release
+ display: remember text and column positions when softwrapping a line
+ docs: concisely describe how the linter behaves
+ docs: remove the two notices about the changed defaults
+ docs: rename README.GIT to README.hacking, so it's clearer what is meant
+ docs: stop mentioning the obsoleted keywords that were removed
+ files: designate the root directory with a simple "/", not with "//"
+ formatter: instead of leaving curses, use full_refresh() to wipe messages
+ gnulib: update to its current upstream state
+ help: reshuffle two shortcuts so that more help-line items are paired
+ options: stop accepting -z, as --suspendable has been dropped too
+ rcfile: remove five obsolete or deprecated keywords
+ syntax: default: do not colorize a square or angle bracket after a URL
+ syntax: perl: add missing keywords, and reduce the length of some lines
+ syntax: python: mention an alternative linter in a comment
+ tweaks: add a missing word to a news item
+ tweaks: add a translator hint
+ tweaks: improve a comment, and reshuffle two functions plus some lines
+ tweaks: put each regex on separate line, to better show many keywords
+ tweaks: rename a variable, to not be the same as a function name
+ tweaks: rename two variables, to not contain the name of another
+ tweaks: reshuffle a description and rewrap another
+ tweaks: reshuffle a few lines, to group things better
+ version: condense the copyright message, to not dominate the output
+
+LIU Hao (1):
+ build: ignore errors from `git describe`
+
+
Changes between v6.2 and v6.3:
------------------------------
diff --git a/NEWS b/NEWS
index eff76200..cda504f9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+2022.08.02 - GNU nano 6.4 "Regentag Dunkelbunt Hundertwasser"
+• The file browser does not crash when moving up to the root folder.
+• Softwrapping very long lines is done more efficiently.
+• Invoking the formatter does not blink the screen.
+
2022.04.28 - GNU nano 6.3 "Wat zullen we drinken? Wat een dorst!"
• For multiline regexes, text is now colored as soon as a start match
is found, also when there is no end match at all.
diff --git a/README b/README
index 5666394e..75606d6e 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ Appearance
In rough ASCII graphics, this is what nano's screen looks like:
____________________________________________________________________
- | GNU nano 6.3 filename Modified |
+ | GNU nano 6.4 filename Modified |
--------------------------------------------------------------------
| This is the text window, displaying the contents of a 'buffer', |
| the contents of the file you are editing. |
diff --git a/configure.ac b/configure.ac
index 7c63ed70..5cad9a75 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 https://www.gnu.org/licenses/.
-AC_INIT([GNU nano], [6.3], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [6.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 1ccb7e0b..8d74b6b8 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -92,7 +92,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 6.3. 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 6.4. 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 d45471bd..653e9aad 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 6.3" "April 2022"
+.TH NANO 1 "version 6.4" "August 2022"
.SH NAME
nano \- Nano's ANOther editor, inspired by Pico
diff --git a/doc/nano.texi b/doc/nano.texi
index d293f1a9..ae73aa4e 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -13,8 +13,8 @@ The complete manual for the GNU nano text editor.
@smallbook
@set EDITION 0.6
-@set VERSION 6.3
-@set UPDATED April 2022
+@set VERSION 6.4
+@set UPDATED August 2022
@dircategory Editors
@direntry
@@ -29,7 +29,7 @@ The complete manual for the GNU nano text editor.
@title GNU @command{nano}
@subtitle a small and friendly text editor
-@subtitle version 6.3
+@subtitle version 6.4
@author Chris Allegretta
@@ -76,7 +76,7 @@ For suggesting improvements: @email{nano-devel@@gnu.org}
@node Top
@top
-This manual documents GNU @command{nano}, version 6.3.
+This manual documents GNU @command{nano}, version 6.4.
@menu
* Introduction::
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index f2f579e4..1527c518 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 6.3" "April 2022"
+.TH NANORC 5 "version 6.4" "August 2022"
.SH NAME
nanorc \- GNU nano's configuration file
diff --git a/doc/rnano.1 b/doc/rnano.1
index a9c218f2..f0c82b45 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 6.3" "April 2022"
+.TH RNANO 1 "version 6.4" "August 2022"
.SH NAME
rnano \- a restricted nano
diff --git a/roll-a-release.sh b/roll-a-release.sh
index 1b532f98..6e3f8093 100755
--- a/roll-a-release.sh
+++ b/roll-a-release.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION="6.3"
+VERSION="6.4"
./configure -C --enable-tiny && make && ./configure -C &&