diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9af0aa052..c86059999 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,4 @@
-- Windows: add experimental support for BTLE dive computers.
-  For more information have a look at section 5.2.2 of the user
-  manual ("On Windows").
-- Import: Fix import of CSV files containing quotes
-- Desktop: Show coordinates if no tags from reverse geo lookup
-- Desktop: Sort on date in case of equal fields
-- Desktop: Indicate sort direction in list header
-- Desktop: Use defined sort-order when switching sort column
-- Fix a bug in planner for dives with manual gas changes.
-- Mobile: add full text filtering of the dive list
-- Desktop: don't add dive-buddy or dive-master when tabbing through fields
-- Filter: don't recalculate all filters on dive list-modifying operations
-- Desktop: don't recalculate full dive list on dive list-modifying operations
-- Undo: implement undo/redo for all dive list-modifying operations
-- Mobile: preserve manual/auto sync with cloud [#1725]
-- Desktop: don't show "invalid dive site" debugging message
-- Map: zoom on dive site when selecting items in dive site list
-- Performance: calculate full statistics only when needed
-- HTML export: write statistics of exported dives only
-- Desktop: fix calculation of surface interval in the case of overlappimg dives
-- Desktop: import Poseidon MkIV via dive log import dialog
+- Tag: high level what changed (please replace this line with your first CHANGELOG entry)
 ---
 * 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 d0a2ca9a6..5e27a063c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Subsurface [![Build Status](https://travis-ci.org/Subsurface-divelog/subsurface.svg?branch=master)](https://travis-ci.org/Subsurface-divelog/subsurface)
 
-This is the README file for Subsurface 4.8.3
+This is the README file for Subsurface 4.8.4
 
 Please check the `ReleaseNotes.txt` for details about new features and
-changes since Subsurface 4.8.2 (and earlier versions).
+changes since Subsurface 4.8.3 (and earlier versions).
 
 Subsurface can be found at http://subsurface-divelog.org
 
@@ -38,10 +38,10 @@ development version) you can either get this via git or the release tar
 ball. After cloning run the following command:
 
 ```
-git checkout v4.8.3  (or whatever the last release is)
+git checkout v4.8.4  (or whatever the last release is)
 ```
 
-or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-4.8.3.tgz
+or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-4.8.4.tgz
 
 Detailed build instructions can be found in the INSTALL file.
 
diff --git a/ReleaseNotes/ReleaseNotes.txt b/ReleaseNotes/ReleaseNotes.txt
index 0adecc229..69f5fb49b 100644
--- a/ReleaseNotes/ReleaseNotes.txt
+++ b/ReleaseNotes/ReleaseNotes.txt
@@ -2,6 +2,30 @@
 
 = _Subsurface_ Release Notes
 
+New in _Subsurface_ 4.8.4
+~~~~~~~~~~~~~~~~~~~~~~~~~
+- Windows: add experimental support for BTLE dive computers.
+  For more information have a look at section 5.2.2 of the user manual ("On Windows").
+- Desktop: Import: Fix import of CSV files containing quotes
+- Desktop: Show coordinates if no tags from reverse geo lookup
+- Desktop: Sort on date in case of equal fields
+- Desktop: Indicate sort direction in list header
+- Desktop: Use defined sort-order when switching sort column
+- Desktop: Fix a bug in planner for dives with manual gas changes.
+- Desktop: don't add dive-buddy or dive-master when tabbing through fields
+- Desktop: don't recalculate all filters on dive list-modifying operations
+- Desktop: don't recalculate full dive list on dive list-modifying operations
+- Desktop: implement undo/redo for all dive list-modifying operations
+- Desktop: don't show "invalid dive site" debugging message
+- Desktop: HTML export: write statistics of exported dives only
+- Desktop: fix calculation of surface interval in the case of overlappimg dives
+- Desktop: import Poseidon MkIV via dive log import dialog
+- Performance: calculate full statistics only when needed
+- Map: zoom on dive site when selecting items in dive site list
+- Mobile: add full text filtering of the dive list
+- Mobile: allow multiple dive masters [#1853]
+- Mobile: preserve manual/auto sync with cloud [#1725]
+
 New in _Subsurface_ 4.8.3
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 - Desktop: enable GPU switching on macOS