diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7fac522f..c4d50a0f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,3 @@
-planner: fix a bug setting the MND for gasmix with 21% oxygen
-mobile: remove support for acquiring fine grain location / GPS
-mobile: Add support for rich text when displaying dive notes
-core: fix off-by-one causing incorrect profile display #3184
 ---
 * Always add new entries at the very top of this file above other existing entries and this note.
 * Use this layout for new entries: `[Area]: [Details about the change] [reference thread / issue]`
diff --git a/README.md b/README.md
index a07017bcd..6539e6d2d 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@
 ![Build Status](https://github.com/subsurface/subsurface/workflows/Ubuntu%2020.10%20/%20Qt%205.14--/badge.svg)
 ![Build Status](https://github.com/subsurface/subsurface/workflows/openSUSE/Tumbleweed%20/%20Qt%20latest--/badge.svg)
 
-This is the README file for Subsurface 5.0.3
+This is the README file for Subsurface 5.0.4
 
 Please check the `ReleaseNotes.txt` for details about new features and
-changes since Subsurface 5.0.2 (and earlier versions).
+changes since Subsurface 5.0.3 (and earlier versions).
 
 Subsurface can be found at http://subsurface-divelog.org
 
@@ -49,10 +49,10 @@ development version) you can either get this via git or the release tar
 ball. After cloning run the following command:
 
 ```
-git checkout v5.0.3  (or whatever the last release is)
+git checkout v5.0.4  (or whatever the last release is)
 ```
 
-or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-5.0.3.tgz
+or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-5.0.4.tgz
 
 Detailed build instructions can be found in the INSTALL file.
 
diff --git a/ReleaseNotes/ReleaseNotes.txt b/ReleaseNotes/ReleaseNotes.txt
index 621f00daa..d6e20300f 100644
--- a/ReleaseNotes/ReleaseNotes.txt
+++ b/ReleaseNotes/ReleaseNotes.txt
@@ -2,6 +2,15 @@
 
 = _Subsurface_ Release Notes
 
+New in _Subsurface_ 5.0.4
+~~~~~~~~~~~~~~~~~~~~~~~~~
+- desktop: fix potential crash when selecting multiple dives marked invalid
+- picture import: better support for large time stamp deltas
+- planner: fix a bug setting the MND for gasmix with 21% oxygen
+- core: fix off-by-one causing incorrect profile display #3184
+- core: due to a bug in 5.0.3 certain dive logs were incorrectly stored and couldn't subsequently be read back
+- core: fix potential crashes with very complex XML files
+
 New in _Subsurface_ 5.0.3
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 - Correct OTU and CNS calculations for planned bailout