diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06d663a24..2162df934 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.8.0] - 2020-02-16
+
+Device Protocol: 4.**7.0** | Module Protocol: 4.1.0 | User Config: 4.1.1 | Hardware Config: 1.0.0
+
+- Prevent deadlocks and races in USB semaphores. If your UHK frooze every now and then, it shouldn't happen again.
+- Implement mouse buttons 4-8.
+- Make arrow scancodes stick their modifiers.
+- Implement functional trackpoint firmware.
+- Expose toggled layer via the GetKeyboardState USB command. `DEVICEPROTOCOL:MINOR`
+
 ## [8.7.1] - 2020-01-07
 
 Device Protocol: 4.6.0 | Module Protocol: 4.1.0 | User Config: 4.1.1 | Hardware Config: 1.0.0
diff --git a/lib/agent b/lib/agent
index f23cf0448..84567c9b4 160000
--- a/lib/agent
+++ b/lib/agent
@@ -1 +1 @@
-Subproject commit f23cf044896b70d447e16ad459a1a6bed107ef48
+Subproject commit 84567c9b4c370550bdb1533b2b71e58fa80efd74
diff --git a/scripts/package.json b/scripts/package.json
index 17e5ff20b..40faedbe0 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -15,8 +15,8 @@
     "commander": "^2.11.0",
     "shelljs": "^0.7.8"
   },
-  "firmwareVersion": "8.7.1",
-  "deviceProtocolVersion": "4.6.0",
+  "firmwareVersion": "8.8.0",
+  "deviceProtocolVersion": "4.7.0",
   "moduleProtocolVersion": "4.1.0",
   "userConfigVersion": "4.1.1",
   "hardwareConfigVersion": "1.0.0",
diff --git a/shared/versions.h b/shared/versions.h
index 2d2e04940..fcb6536f0 100644
--- a/shared/versions.h
+++ b/shared/versions.h
@@ -19,11 +19,11 @@
 // Variables:
 
     #define FIRMWARE_MAJOR_VERSION 8
-    #define FIRMWARE_MINOR_VERSION 7
-    #define FIRMWARE_PATCH_VERSION 1
+    #define FIRMWARE_MINOR_VERSION 8
+    #define FIRMWARE_PATCH_VERSION 0
 
     #define DEVICE_PROTOCOL_MAJOR_VERSION 4
-    #define DEVICE_PROTOCOL_MINOR_VERSION 6
+    #define DEVICE_PROTOCOL_MINOR_VERSION 7
     #define DEVICE_PROTOCOL_PATCH_VERSION 0
 
     #define MODULE_PROTOCOL_MAJOR_VERSION 4