diff --git a/changelog.md b/changelog.md
index 5009ced8f0c60eb9f5851f5b6e3c57f389913f52..84815b7c25a8fd2658cc6f3f4421cc34a5a78f91 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,17 @@
 # changelog
 
+## 3.6.18
+`2023-3-23`
+* `FIX` [#1943]
+* `FIX` [#1996]
+* `FIX` [#2004]
+* `FIX` [#2013]
+
+[#1943]: https://github.com/LuaLS/lua-language-server/issues/1943
+[#1996]: https://github.com/LuaLS/lua-language-server/issues/1996
+[#2004]: https://github.com/LuaLS/lua-language-server/issues/2004
+[#2013]: https://github.com/LuaLS/lua-language-server/issues/2013
+
 ## 3.6.17
 `2023-3-9`
 * `CHG` export documents: export global variables
diff --git a/package.json b/package.json
index 25b553914cba231876d6f3fb152e4db302d6605b..081be7ecfca9a2aa8c35e3e6c9c667624de5a740 100644
--- a/package.json
+++ b/package.json
@@ -3070,5 +3070,5 @@
 	"sponsor": {
 		"url": "https://github.com/LuaLS/lua-language-server/issues/484"
 	},
-	"version": "3.6.17"
+	"version": "3.6.18"
 }
diff --git a/package/build.lua b/package/build.lua
index 756520f6d2361801b4cf62dc3a24a89e57daaf07..1a227e8ad657586e5d88f09a765b2b8ef3624d6a 100644
--- a/package/build.lua
+++ b/package/build.lua
@@ -1,6 +1,6 @@
 local json = require 'json-beautify'
 
-local VERSION = "3.6.17"
+local VERSION = "3.6.18"
 
 local package = require 'package.package'
 local fsu     = require 'fs-utility'
diff --git a/server b/server
index 6d79a662a4d1f95a80d29af46eaae5ff9a659341..50f77465af5ded634fd7aef07699cc4fc1c704f8 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 6d79a662a4d1f95a80d29af46eaae5ff9a659341
+Subproject commit 50f77465af5ded634fd7aef07699cc4fc1c704f8