diff --git a/Changelog.md b/Changelog.md
index 85ea39f2..6ac7423e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 
+## Kanmon Bridge 3.21.1
+
+### Changed
+* BRIDGE-383: Extended internal mailbox conflict resolution logic and minor changes to the mailbox conflict pre-checker. 
+
+
 ## Kanmon Bridge 3.21.0
 
 ### Added 
diff --git a/Makefile b/Makefile
index ecc3e3e7..33cbb295 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ROOT_DIR:=$(realpath .)
 .PHONY: build build-gui build-nogui build-launcher versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=3.21.0+git
+BRIDGE_APP_VERSION?=3.21.1+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG