diff --git a/Changelog.lua b/Changelog.lua
index 5339eb95..6d49a44d 100644
--- a/Changelog.lua
+++ b/Changelog.lua
@@ -6,6 +6,15 @@
 local zo_strformat = zo_strformat
 
 local changelogMessages = {
+    "|cFFA500LuiExtended Version 6.0.1|r",
+    "",
+    "|cFFFF00General:|r",
+    "[*] Fixed an issue with the Crowd Control Tracker where \"Player Set AOE\" was using the setting for \"Player Ultimate AOE.\"",
+    "[*] Fixed an issue where the keybinding options for Summon Banker/Merchant were reversed (Banker key summoned Merchant and vice versa).",
+    "[*] Fixed a few strings missing from the German translation.",
+    "",
+    "|cFFA500LuiExtended Version 6.0.0|r",
+    "",
     "|cFFFF00General:|r",
     "[*] DE translation has been started and populated thoroughly thanks to AmonFlorian!",
     "[*] Added keybindings to summon the new Cat Banker/Merchant from the crown store.",
diff --git a/LuiExtended.lua b/LuiExtended.lua
index 4bd0e032..fd0a5659 100644
--- a/LuiExtended.lua
+++ b/LuiExtended.lua
@@ -8,7 +8,7 @@ if LUIE == nil then LUIE = {} end
 
 LUIE.tag         = "LUIE"
 LUIE.name        = "LuiExtended"
-LUIE.version     = "6.0.0"
+LUIE.version     = "6.0.1"
 LUIE.author      = "ArtOfShred, psypanda & SpellBuilder"
 LUIE.website     = "https://www.esoui.com/downloads/info818-LuiExtended.html"
 LUIE.github      = "https://github.com/ArtOfShred/LuiExtended"
diff --git a/LuiExtended.txt b/LuiExtended.txt
index 38ca6a58..d7346d5c 100644
--- a/LuiExtended.txt
+++ b/LuiExtended.txt
@@ -1,8 +1,8 @@
 ## Title: |cE12000L|cFFFFB0ui E|rxtended|
 ## Author: ArtOfShred, psypanda, SpellBuilder
-## Version: 6.0.0
+## Version: 6.0.1
 ## APIVersion: 100030
-## AddOnVersion: 600
+## AddOnVersion: 601
 ## Description: Provides UnitFrames, InfoPanel, Combat Text & Info, Buffs & Debuff Tracking, Chat Announcements and Slash Commands.
 ## DependsOn: LibAddonMenu-2.0 LibMediaProvider-1.0
 ## OptionalDependsOn: LibStub
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 4f62ff4b..74946a74 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,3 +1,12 @@
+### Version 6.0.1
+
+General
+- Fixed an issue with the Crowd Control Tracker where "Player Set AOE" was using the setting for "Player Ultimate AOE."
+- Fixed an issue where the keybinding options for Summon Banker/Merchant were reversed (Banker key summoned Merchant and vice versa).
+- Fixed a few strings missing from the German translation.
+
+---
+
 ### Version 6.0.0
 
 General