diff --git a/PortableApps/App/AppInfo/appinfo.ini b/PortableApps/App/AppInfo/appinfo.ini
index 0e954b406c..dec3f461ee 100644
--- a/PortableApps/App/AppInfo/appinfo.ini
+++ b/PortableApps/App/AppInfo/appinfo.ini
@@ -1,6 +1,6 @@
 [Version]
-PackageVersion=21.3.4.0
-DisplayVersion=210304
+PackageVersion=21.3.12.0
+DisplayVersion=210312
 
 [Format]
 Type=PortableApps.comFormat
diff --git a/Release/ConEmu/WhatsNew-ConEmu.txt b/Release/ConEmu/WhatsNew-ConEmu.txt
index c7626d8dcd..b8f4bc97f5 100644
--- a/Release/ConEmu/WhatsNew-ConEmu.txt
+++ b/Release/ConEmu/WhatsNew-ConEmu.txt
@@ -20,6 +20,17 @@ https://conemu.github.io/en/Whats_New.html
 -------------------------------------------
 
 
+2021.3.12
+* gh-2280: Let's tripple click select long lines wrapped on several rows (same AI as in copying selected text).
+* Correct double-click selection condition (was unselected unexpectedly in some cases, e.g. dblclick over comma).
+* Let's triple click select last line trimming trailing spaces.
+* gh-2292: Programs failed to run with `-new_console:i` switch from existing consoles.
+* gh-2212: Fix command execution from Far Manager (files with commas, unquoted batches).
+* gh-2279: Allow commands like `-run "cmd /k echo Hello world"`.
+* Executor: choose ConEmuC bitness according to ComSpec settings.
+* l10n: translations were updated
+
+
 2021.3.4
 * gh-2212: Fix executer in Far 1.75 (commands with redirections).
 * gh-2249, gh-2248: ANSI: Fix new line processing (screen issues).
diff --git a/src/ConEmu/version.h b/src/ConEmu/version.h
index 036eab94bd..4a3d50f716 100644
--- a/src/ConEmu/version.h
+++ b/src/ConEmu/version.h
@@ -1,7 +1,7 @@
-// 210304
+// 210312
 #define MVV_1 21
 #define MVV_2 3
-#define MVV_3 4
+#define MVV_3 12
 #define MVV_4 0
 #define MVV_4a ""
 #undef MVV_git
diff --git a/src/Setup/Setupper/VersionI.h b/src/Setup/Setupper/VersionI.h
index 660faca9ed..4fd7b5eada 100644
--- a/src/Setup/Setupper/VersionI.h
+++ b/src/Setup/Setupper/VersionI.h
@@ -1,5 +1,5 @@
-#define CONEMUVERN 21,3,4,0
-#define CONEMUVERS "210304"
-#define CONEMUVERL L"210304"
-#define MSI86 "../ConEmu.210304.x86.msi"
-#define MSI64 "../ConEmu.210304.x64.msi"
+#define CONEMUVERN 21,3,12,0
+#define CONEMUVERS "210312"
+#define CONEMUVERL L"210312"
+#define MSI86 "../ConEmu.210312.x86.msi"
+#define MSI64 "../ConEmu.210312.x64.msi"
diff --git a/src/Setup/Version.wxi b/src/Setup/Version.wxi
index 7c38cca9cf..bd9b7da73e 100644
--- a/src/Setup/Version.wxi
+++ b/src/Setup/Version.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
 
-  <?define Version = '$(var.MajorVersion).210.3040' ?>
-  <?define ConEmuVerS = '210304.$(var.Platform)' ?>
+  <?define Version = '$(var.MajorVersion).210.3120' ?>
+  <?define ConEmuVerS = '210312.$(var.Platform)' ?>
 
 </Include>
\ No newline at end of file