diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffbf4ed5b..3f14b5350 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,4 @@
-- desktop: improve the appearance in dark mode
-- add Garmin Descent Mk2/Mk2i support for Linux, macOS, and 64bit Windows
-- desktop: add 64bit Windows build
-- desktop: make device management undoable
-- desktop: fix crash on drag&drop into tag widgets [#3030]
-- macOS: fix issue with HID dive computers like Suunto Eon Core/Steel [#2999]
-- windows: add missing modern Vista theme
 - mobile: add location service warning as required by Google Play
-- desktop: allow adding dives to arbitrary trips
-- core: improve merging of cylinder pressures [#2884]
-- desktop: respect page-up, page-down, home and end keys for selection change [#2957]
-- Use pO2 from prefernces for MOD display in equipment tab
-- filter: more flexible filtering system based on individual constraints
 - mobile: fix manually adding dives in the past [#2971]
 
 ---
diff --git a/README.md b/README.md
index 09e1d3017..a9124af87 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@
 ![Build Status](https://github.com/subsurface/subsurface/workflows/Ubuntu%2018.04%20/%20Qt%205.9/badge.svg) 
 ![Build Status](https://github.com/subsurface/subsurface/workflows/Ubuntu%2019.10%20/%20Qt%205.12/badge.svg) 
 
-This is the README file for Subsurface 4.9.7
+This is the README file for Subsurface 4.9.8
 
 Please check the `ReleaseNotes.txt` for details about new features and
-changes since Subsurface 4.9.5 (and earlier versions).
+changes since Subsurface 4.9.7 (and earlier versions).
 
 Subsurface can be found at http://subsurface-divelog.org
 
@@ -47,10 +47,10 @@ development version) you can either get this via git or the release tar
 ball. After cloning run the following command:
 
 ```
-git checkout v4.9.7  (or whatever the last release is)
+git checkout v4.9.8  (or whatever the last release is)
 ```
 
-or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-4.9.7.tgz
+or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-4.9.8.tgz
 
 Detailed build instructions can be found in the INSTALL file.
 
diff --git a/ReleaseNotes/ReleaseNotes.txt b/ReleaseNotes/ReleaseNotes.txt
index 5ea95ae60..a66034d95 100644
--- a/ReleaseNotes/ReleaseNotes.txt
+++ b/ReleaseNotes/ReleaseNotes.txt
@@ -2,6 +2,23 @@
 
 = _Subsurface_ Release Notes
 
+New in _Subsurface_ 4.9.8
+~~~~~~~~~~~~~~~~~~~~~~~~~
+- filter: more flexible filtering system based on individual constraints
+- desktop: improve the appearance in dark mode
+- desktop: fix crash on drag&drop into tag widgets [#3030]
+- desktop: allow adding dives to arbitrary trips
+- desktop: respect page-up, page-down, home and end keys for selection change [#2957]
+- equipment: use pO2 from prefernces for MOD display
+- core: make device management undoable
+- core: improve merging of cylinder pressures [#2884]
+- Windows: add separate 32bit and 64bit builds - the 32bit build does NOT support the Garmin Descent Mk2/Mk2i
+- Windows: add missing modern Vista theme
+- macOS: fix issue with HID dive computers like Suunto Eon Core/Steel [#2999]
+
+dive computer support:
+- add Garmin Descent Mk2/Mk2i support for Linux, macOS, and 64bit Windows
+
 New in _Subsurface_ 4.9.7
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 - equipment: don't overwrite already set weights when changing weight type [#2938]