diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5001f053d..ed8ef9b3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,18 @@
+# 5.5.4
+  - Changes from 5.5.3
+    - Bugfixes
+      - PR #3561 - added missing backwards speeds for cycleways in bicycle profile
+      - PR #3515 - adjusted number of `nodes` in `annotation`
+      - Ticket #3430 - Fix possible division by zero by clamping latitude to +/- 85.05
+      - PR #3555 - Fix an error that occurs when a road forks immediately after exiting a ferry
+      - PR #3575 - Don't emit invalid turn types for obvious turns at sliproads and roundabouts.
+
 # 5.5.3
   - Changes from 5.5.2
     - Bugfixes:
       - PR #3504 - debug tiles were very slow to generate due to unnecessarily copying data in a hot loop.
       - PR #3556 - fix an assertion in the walking profile triggered by tight spiral stairwells
       - PR #3469 - don't assert when identical coordinates are supplied to some calculations - OSM data contains these, we shouldn't crash.
-      - PR #3515 - adjusted number of `nodes` in `annotation`
-      - PR #3561 - added missing backwards speeds for cycleways in bicycle profile
     - Enhancements:
       - backported 6ea9f9fdf19 - when anticipating upcoming lanes, consider how many lanes need to be crossed to get there.
       - when using osrm-datastore, it will attempt to clean up locks if it crashes.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 666e86784..637818d83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ endif()
 project(OSRM C CXX)
 set(OSRM_VERSION_MAJOR 5)
 set(OSRM_VERSION_MINOR 5)
-set(OSRM_VERSION_PATCH 3)
+set(OSRM_VERSION_PATCH 4)
 set(OSRM_VERSION "${OSRM_VERSION_MAJOR}.${OSRM_VERSION_MINOR}.${OSRM_VERSION_PATCH}")
 
 add_definitions(-DOSRM_PROJECT_DIR="${CMAKE_CURRENT_SOURCE_DIR}")