diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20857d541..3d4549d5de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 ChangeLog
 =========
 
+12.18.1 (2020/02/20)
+-------------------
+### 🐛Fixes
+* タイムラインのハイライトに自分のノートは含めないように
+* ハッシュタグの集計に関する問題を修正
+
 12.18.0 (2020/02/20)
 -------------------
 ### ✨Improvements
diff --git a/package.json b/package.json
index cb266e56a5..72e04f7c50 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.18.0",
+	"version": "12.18.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",