diff --git a/ChangeLog b/ChangeLog
index bf65055e..bc7c216e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Changes between v8.2 and v8.3:
+------------------------------
+
+Benno Schulenberg (16):
+ build: fix a compilation error with gcc-15
+ bump version numbers and add a news item for the 8.3 release
+ docs: add Shift+PgUp/PgDown to the FAQ item about urxvt modified keys
+ docs: clarify the possible effects of a misuse of braced function names
+ docs: put a space after "|" and before "{enter}" in the sample nanorc
+ gnulib: update to its current upstream state
+ syntax: groff: correct the mistaken .rof extension to .roff
+ syntax: groff: recognize also the .mom extension
+ syntax: makefile: colorize also multiple targets
+ syntax: markdown: accept also digit 0 in a list marker
+ syntax: spec: colorize all canonical architecture names
+ tweaks: add a small clarifying comment
+ tweaks: add a translator hint
+ tweaks: adjust another translator hint, and add two more
+ tweaks: adjust a translator hint, and add another one
+ tweaks: drop six unneeded casts
+
+LIU Hao (1):
+ syntax: asm: add end-of-word anchors to the keywords
+
+Lukáš Zaoral (1):
+ memory: avoid a leak when linter aborts after producing parsable output
+
+
Changes between v8.1 and v8.2:
------------------------------
diff --git a/NEWS b/NEWS
index 20a01ac8..3b4ba68d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2024.12.21 - GNU nano 8.3 "like mice in the dream of a tabby cat"
+• A build failure with gcc-15 is fixed.
+• Several translations were updated.
+
2024.09.05 - GNU nano 8.2 "Charlotte will climb walls!"
• At a Yes-No prompt, beside Y and the localized initial for "Yes",
also ^Y is accepted. Similarly, ^N for "No", and ^A for "All".
diff --git a/README b/README
index 5ce5ba21..eb75e5e2 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ Appearance
In rough ASCII graphics, this is what nano's screen looks like:
____________________________________________________________________
- | GNU nano 8.2 filename Modified |
+ | GNU nano 8.3 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 b0356be5..abd4f336 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], [8.2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [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 a8b6b73d..781bf149 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 8.2. 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 8.3. 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 c2dcf966..eaaee139 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 8.2" "September 2024"
+.TH NANO 1 "version 8.3" "December 2024"
.SH NAME
nano \- Nano's ANOther text editor, inspired by Pico
diff --git a/doc/nano.texi b/doc/nano.texi
index d627bb13..7db0ebfa 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.8
-@set VERSION 8.2
-@set UPDATED September 2024
+@set VERSION 8.3
+@set UPDATED December 2024
@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 8.2
+@subtitle version 8.3
@author Chris Allegretta
@@ -79,7 +79,7 @@ For suggesting improvements: @email{nano-devel@@gnu.org}
@node Top
@top
-This manual documents GNU @command{nano}, version 8.2.
+This manual documents GNU @command{nano}, version 8.3.
@menu
* Introduction::
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index 63c2aa2a..0bd723c5 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 8.2" "September 2024"
+.TH NANORC 5 "version 8.3" "December 2024"
.SH NAME
nanorc \- GNU nano's configuration file
diff --git a/doc/rnano.1 b/doc/rnano.1
index 36a7eb43..b82a6f72 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 8.2" "September 2024"
+.TH RNANO 1 "version 8.3" "December 2024"
.SH NAME
rnano \- a restricted nano
diff --git a/roll-a-release.sh b/roll-a-release.sh
index 8fef2afb..39c9af5d 100755
--- a/roll-a-release.sh
+++ b/roll-a-release.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION="8.2"
+VERSION="8.3"
./configure -C --enable-tiny && make && ./configure -C &&