diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e8e295e6..0ba284890 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,3 @@
-desktop: fix removal/editing of bookmarks on the profile
-export: show progress dialog when exporting to TeX
-printing: use sensible font size even for strange window size
-* Planner: Don't immediately ascent automatically
 
 ---
 * Always add new entries at the very top of this file above other existing entries and this note.
diff --git a/README.md b/README.md
index 284bbfaff..799847c9d 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.1
+This is the README file for Subsurface 5.0.2
 
 Please check the `ReleaseNotes.txt` for details about new features and
-changes since Subsurface 5.0 (and earlier versions).
+changes since Subsurface 5.0.1 (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.1  (or whatever the last release is)
+git checkout v5.0.2  (or whatever the last release is)
 ```
 
-or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-5.0.1.tgz
+or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-5.0.2.tgz
 
 Detailed build instructions can be found in the INSTALL file.
 
diff --git a/ReleaseNotes/ReleaseNotes.txt b/ReleaseNotes/ReleaseNotes.txt
index 2fb892fb1..996819fc4 100644
--- a/ReleaseNotes/ReleaseNotes.txt
+++ b/ReleaseNotes/ReleaseNotes.txt
@@ -2,6 +2,26 @@
 
 = _Subsurface_ Release Notes
 
+New in _Subsurface_ 5.0.2
+~~~~~~~~~~~~~~~~~~~~~~~~~
+- desktop: fix removal/editing of bookmarks on the profile
+- export: show progress dialog when exporting to TeX
+- printing: use sensible font size even for strange window size
+- planner: don't immediately ascent automatically
+- planner: various small bug fixes
+- import: fix parsing of translated ADP header strings
+- dive edit: add ability to copy and paste dive nr and date
+- core: prevent crash when parsing certain very complex XML files
+- cloud: support redundandant backup servers
+- cloud: try to pick a server close to the user if possible
+
+dive computer support:
+- add Suunto Eon Steel Black
+- add Sherwood Beacon
+- add new variant of Zoop Novo
+- add new variants of Shearwater Perdix AI
+- add Sporasub SP2
+
 New in _Subsurface_ 5.0.1
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 - fix Windows crash when changing log file
diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html
index 3be5a2818..b60fc55ae 100644
--- a/SupportedDivecomputers.html
+++ b/SupportedDivecomputers.html
@@ -81,13 +81,16 @@
 	    <li>Nerd, Nerd 2, Perdix, Perdix AI, Peregrine, Petrel, Petrel 2, Predator, Teric</li></ul>
     </dd>
     <dt>Sherwood</dt><dd><ul>
-	    <li>Amphos, Amphos Air, Insight, Insight 2, Sage, Vision, Wisdom, Wisdom 2, Wisdom 3, Wisdom 4</li></ul>
+	    <li>Amphos, Amphos Air, Beacon, Insight, Insight 2, Sage, Vision, Wisdom, Wisdom 2, Wisdom 3, Wisdom 4</li></ul>
+    </dd>
+    <dt>Sporasub</dt><dd><ul>
+	    <li>SP2</li></ul>
     </dd>
     <dt>Subgear</dt><dd><ul>
 	    <li>XP Air, XP-10, XP-3G, XP-Air</li></ul>
     </dd>
     <dt>Suunto</dt><dd><ul>
-	    <li>Cobra, Cobra 2, Cobra 3, D3, D4, D4f, D4i, D5, D6, D6i, D9, D9tx, DX, EON Core, EON Steel, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo</li></ul>
+	    <li>Cobra, Cobra 2, Cobra 3, D3, D4, D4f, D4i, D5, D6, D6i, D9, D9tx, DX, EON Core, EON Steel, EON Steel Black, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo</li></ul>
     </dd>
     <dt>Tecdiving</dt><dd><ul>
 	    <li>DiveComputer.eu</li></ul>
diff --git a/SupportedDivecomputers.txt b/SupportedDivecomputers.txt
index 48ed3e094..1494b3d0c 100644
--- a/SupportedDivecomputers.txt
+++ b/SupportedDivecomputers.txt
@@ -26,9 +26,10 @@ Seabaer: T1, H3, HUDC
 Seac: Guru, Jack
 Seemann: XP5
 Shearwater: Nerd, Nerd 2, Perdix, Perdix AI, Peregrine, Petrel, Petrel 2, Predator, Teric
-Sherwood: Amphos, Amphos Air, Insight, Insight 2, Sage, Vision, Wisdom, Wisdom 2, Wisdom 3, Wisdom 4
+Sherwood: Amphos, Amphos Air, Beacon, Insight, Insight 2, Sage, Vision, Wisdom, Wisdom 2, Wisdom 3, Wisdom 4
+Sporasub: SP2
 Subgear: XP Air, XP-10, XP-3G, XP-Air
-Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4f, D4i, D5, D6, D6i, D9, D9tx, DX, EON Core, EON Steel, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo
+Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4f, D4i, D5, D6, D6i, D9, D9tx, DX, EON Core, EON Steel, EON Steel Black, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vyper Novo, Vytec, Zoop, Zoop Novo
 Tecdiving: DiveComputer.eu
 Tusa: Element II (IQ-750), IQ-700, Talis, Zen (IQ-900), Zen Air (IQ-950)
 Uemis: Zürich SDA