diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8849992478..d582a13226e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 5.12.4
+
+### System Improvements
+
+-   (OmegaRogue) Add 500ms delay for drag-and-drop sort for touch devices
+
+### Bugfixes
+
+-   (jfn4th) Prevent erroneous triggering of sheet handlers
+-   (stwlam) Add temporary measure to handle skill data preparation for PCs older than ~2 years
+-   (stwlam) Add room to certain areas of spell collections on actor sheets to accommodate localized text
+
+### Data Updates
+
+-   (Dire Weasel) Add Darkwood and Mithral renames to Remaster Changes journal entry
+-   (Dire Weasel) Add effects for Cyclonic Ascent, Everlight, Deity's Protection, Resounding Finale
+-   (Dire Weasel) Add links to effects from Hymn Of Healing spell, Sairazul Blue potion
+-   (Dire Weasel) Add missing traits to Execute's vitality overlay
+-   (Dire Weasel) Fix description of Antimagic rune
+-   (Dire Weasel) Remove traits overrides from Malicious Shadow spell overlays
+-   (Dire Weasel) Update description for Light's spell effect to better match remaster
+-   (DocSchlock) Add armor effects for Saurian Spike
+-   (DocSchlock) Change Steam Knight Stance speed bonus type to status
+-   (DocSchlock) Update Call on Ancient Blood to Remaster text
+-   (rectulo) Fix description of swim action
+-   (Rigo) Add effect for Familiar of Restored Spirit, aura effect for heightened Silence
+-   (Rigo) Add Witch's Cauldron Crafting Entry
+
 ## 5.12.3
 
 ### Bugfixes
@@ -31,8 +59,7 @@
 
 ### Data Updates
 
--   (Dharkus) Add effect for Forgive Foe
--   (Dharkus) Add effect for Defaced Nyad Queen's forgiveness
+-   (Dharkus) Add effect for Defaced Nyad Queen's forgiveness, Forgive Foe
 -   (Dharkus) Correct Phomandala's Focus Gaze DC
 -   (Dire Weasel) Fix several errors in Tiger Form effect
 -   (Dire Weasel) Fix Ghostly Weapon to apply only to selected weapon
diff --git a/package-lock.json b/package-lock.json
index 09f31e48efb..ef9b68cd888 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "foundry-pf2e",
-    "version": "5.12.3",
+    "version": "5.12.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "foundry-pf2e",
-            "version": "5.12.3",
+            "version": "5.12.4",
             "license": "Apache-2.0",
             "dependencies": {
                 "@codemirror/autocomplete": "^6.11.1",
diff --git a/package.json b/package.json
index a574b95549a..89688736c33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "foundry-pf2e",
-    "version": "5.12.3",
+    "version": "5.12.4",
     "description": "",
     "private": true,
     "type": "module",
diff --git a/static/system.json b/static/system.json
index 96e46f8007f..2545865eec7 100644
--- a/static/system.json
+++ b/static/system.json
@@ -2,7 +2,7 @@
     "id": "pf2e",
     "title": "Pathfinder Second Edition",
     "description": "A community contributed game system for Pathfinder Second Edition",
-    "version": "5.12.3",
+    "version": "5.12.4",
     "license": "./LICENSE",
     "compatibility": {
         "minimum": "11.311",