diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe29f2a39..d48a76603 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ 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.3.3] - 2018-07-03
+
+Device Protocol: 4.3.1 | Module Protocol: 4.0.0 | User Config: 4.1.0 | Hardware Config: 1.0.0
+
+- Implement the macro engine.
+- Fix the nondeterministic bug that made USB hang.
+- Restore the Windows related commits of firmware 8.3.1 because the USB hang bug has been fixed.
+- Restore debouncing to 100ms until it gets really fixed.
+
 ## [8.3.2] - 2018-06-27
 
 Device Protocol: 4.3.1 | Module Protocol: 4.0.0 | User Config: 4.1.0 | Hardware Config: 1.0.0
diff --git a/lib/agent b/lib/agent
index 32d9635b3..15df8d712 160000
--- a/lib/agent
+++ b/lib/agent
@@ -1 +1 @@
-Subproject commit 32d9635b340e4dfbb12fdcfc909ec89e488ce56a
+Subproject commit 15df8d71299e0547d953874d1a8d21e9147a396f
diff --git a/scripts/package.json b/scripts/package.json
index bf9986984..7b5483022 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -15,7 +15,7 @@
     "commander": "^2.11.0",
     "shelljs": "^0.7.8"
   },
-  "firmwareVersion": "8.3.2",
+  "firmwareVersion": "8.3.3",
   "deviceProtocolVersion": "4.3.1",
   "moduleProtocolVersion": "4.0.0",
   "userConfigVersion": "4.1.0",
diff --git a/shared/versions.h b/shared/versions.h
index 36cc614f7..72a3e3915 100644
--- a/shared/versions.h
+++ b/shared/versions.h
@@ -20,7 +20,7 @@
 
     #define FIRMWARE_MAJOR_VERSION 8
     #define FIRMWARE_MINOR_VERSION 3
-    #define FIRMWARE_PATCH_VERSION 2
+    #define FIRMWARE_PATCH_VERSION 3
 
     #define DEVICE_PROTOCOL_MAJOR_VERSION 4
     #define DEVICE_PROTOCOL_MINOR_VERSION 3