diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index b6115beac..6e052776a 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -33,4 +33,4 @@ jobs:
 
       - name: Build the Docker image
         run: |
-          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.3.3 .
\ No newline at end of file
+          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7 -t b3log/siyuan:latest -t b3log/siyuan:v2.4.0 .
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f55a4bffd..42c2f705d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## v2.4.0 / 2022-10-13
+
+### 引入特性
+
+* [支持设置编辑器只读模式](https://github.com/siyuan-note/siyuan/issues/2648)
+* [增加公共代码 js/css 片段](https://github.com/siyuan-note/siyuan/issues/6143)
+
+### 改进功能
+
+* [查询嵌入块添加面包屑](https://github.com/siyuan-note/siyuan/issues/2985)
+* [起始块由于文字太长导致换行时上键会直接定位到文档标题](https://github.com/siyuan-note/siyuan/issues/6156)
+* [带子级升降级标题层级支持列表块中的标题](https://github.com/siyuan-note/siyuan/issues/6157)
+* [修改桌面端顶栏数据历史图标和图标顺序](https://github.com/siyuan-note/siyuan/issues/6158)
+* [改进查询嵌入块加载性能](https://github.com/siyuan-note/siyuan/issues/6160)
+* [给备注的 tooltip 设置选择器](https://github.com/siyuan-note/siyuan/issues/6161)
+* [改进提及和虚拟引用搜索分词](https://github.com/siyuan-note/siyuan/issues/6165)
+* [软换行后 `》` 无法创建引述块](https://github.com/siyuan-note/siyuan/issues/6170)
+* [出现行级 HTML 节点时转换为 HTML 块渲染](https://github.com/siyuan-note/siyuan/issues/6171)
+
+### 移除功能
+
+* [移除编辑器内文本拖拽功能](https://github.com/siyuan-note/siyuan/issues/6169)
+
+### 修复缺陷
+
+* [无法通过拖动块标移动非列表项的块](https://github.com/siyuan-note/siyuan/issues/6153)
+* [通过快捷键添加行级代码、键盘、标签后方向键跳出行不一致](https://github.com/siyuan-note/siyuan/issues/6155)
+* [标签中的单引号不应该被替换为 HTML 实体](https://github.com/siyuan-note/siyuan/issues/6163)
+* [行级元素内粘贴纯文本应保持该行级元素的状态](https://github.com/siyuan-note/siyuan/issues/6164)
+
 ## v2.3.3 / 2022-10-11
 
 ### 改进功能
diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml
index 699acd203..70395ad8d 100644
--- a/app/appx/AppxManifest.xml
+++ b/app/appx/AppxManifest.xml
@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
-              Version="2.3.3.0"/>
+              Version="2.4.0.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
diff --git a/app/package.json b/app/package.json
index a3b7a66e6..77e573e99 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SiYuan",
-  "version": "2.3.3",
+  "version": "2.4.0",
   "description": "Build Your Eternal Digital Garden",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",
diff --git a/kernel/util/working.go b/kernel/util/working.go
index be06017b2..defa90201 100644
--- a/kernel/util/working.go
+++ b/kernel/util/working.go
@@ -41,7 +41,7 @@ import (
 var Mode = "prod"
 
 const (
-	Ver       = "2.3.3"
+	Ver       = "2.4.0"
 	IsInsider = false
 )