diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e33daebffa..d0b92210aa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## 5.15.4
+
+### Bugfixes
+
+-   (Supe) Fix cantrips and focus spells casting at 1st rank for NPCs above level 20
+-   (Supe) Set spellcasting proficiency to trained if at least one spellcasting entry exists
+
+### Data Updates
+
+-   (Abbadon) Minor corrections for Triggerbrand Salvo, Malevolent Mannequins, and Harlo Krant
+-   (Ambrose M) Add automation for Strix Flight feats, Life Link, and Hand of the Apprentice
+-   (Cuingamehtar) Add new creature trait descriptions from Monster Core
+-   (Dire Weasel) Improve automation of Emblazon Feats
+-   (Dire Weasel) Update Sending's target and refresh it on all NPCs
+-   (DocSchlock) Increase known languages for Bort's Blessing
+-   (DocSchlock) Fix description of the Injection trait
+-   (DocSchlock) Minor corrections for Consecrate and Tekko-Gaki
+-   (jfn4th) Fix message formatting for hag blood magic
+-   (LJSmith066) Fix Meteor Swarm for all NPCs in the bestiary
+-   (LJSmith006) Add automation for Mechanical Symbiosis
+-   (Rigo) Add effects for the Hero Point Deck
+-   (Tikael) Add automation for Pitborn
+-   (Tikael) Fix Barbarian's Spirit Instinct's Greater Weapon Specialization
+-   (Tikael) Restored Ancestry Guide Tiefling and Aasimar feats as Nephilim feats with remaster edits
+-   (Tikael) Incorporate Errata from May 17, 2024
+-   (Dire Weasel, Tikael) Minor corrections for PFS NPCs
+
 ## 5.15.3
 
 ### Bugfixes
diff --git a/package-lock.json b/package-lock.json
index 1a80fab7f62..e57177b4680 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "foundry-pf2e",
-    "version": "5.15.3",
+    "version": "5.15.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/package.json b/package.json
index c69c9ae6f39..25d5eecdd0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "foundry-pf2e",
-    "version": "5.15.3",
+    "version": "5.15.4",
     "description": "",
     "private": true,
     "type": "module",
diff --git a/static/system.json b/static/system.json
index 39569c1d2bb..1f74bf3d7c9 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.15.3",
+    "version": "5.15.4",
     "license": "./LICENSE",
     "compatibility": {
         "minimum": "11.315",