diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5add778..46607dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to the [UHK Versioning](VERSIONING.md) conventions.
 
+## [8.5.4] - 2018-01-05
+
+Device Protocol: 4.5.0 | Module Protocol: 4.0.0 | User Config: 4.1.0 | Hardware Config: 1.0.0
+
+- Make the modifiers of shortcut keys stick only as long as the layer switcher key of a shortcut key is being held.
+
 ## [8.5.3] - 2018-10-20
 
 Device Protocol: 4.5.0 | Module Protocol: 4.0.0 | User Config: 4.1.0 | Hardware Config: 1.0.0
diff --git a/lib/agent b/lib/agent
index a4e3696..1eb8720 160000
--- a/lib/agent
+++ b/lib/agent
@@ -1 +1 @@
-Subproject commit a4e3696078216bc787b682e3323d89a35a517a81
+Subproject commit 1eb87203059447db676e96fdcef106c4b314e5c6
diff --git a/scripts/package.json b/scripts/package.json
index 22142bb..53e4fb9 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -15,7 +15,7 @@
     "commander": "^2.11.0",
     "shelljs": "^0.7.8"
   },
-  "firmwareVersion": "8.5.3",
+  "firmwareVersion": "8.5.4",
   "deviceProtocolVersion": "4.5.0",
   "moduleProtocolVersion": "4.0.0",
   "userConfigVersion": "4.1.0",
diff --git a/shared/versions.h b/shared/versions.h
index 1a6ccf0..36f3e04 100644
--- a/shared/versions.h
+++ b/shared/versions.h
@@ -20,7 +20,7 @@
 
     #define FIRMWARE_MAJOR_VERSION 8
     #define FIRMWARE_MINOR_VERSION 5
-    #define FIRMWARE_PATCH_VERSION 3
+    #define FIRMWARE_PATCH_VERSION 4
 
     #define DEVICE_PROTOCOL_MAJOR_VERSION 4
     #define DEVICE_PROTOCOL_MINOR_VERSION 5