diff --git a/changelog.md b/changelog.md
index 9a729ca98542f711a24880d6006dfc942e2d0405..79469777ccb55adeb1f6a049849d8b01ce7ef563 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
 # changelog
 
+## 2.5.4
+`2021-12-16`
+* `FIX` [#847](https://github.com/sumneko/lua-language-server/issues/847)
+* `FIX` [#848](https://github.com/sumneko/lua-language-server/issues/848)
+* `FIX` completion: incorrect cache
+* `FIX` hover: always view string
+
 ## 2.5.3
 `2021-12-6`
 * `FIX` [#842](https://github.com/sumneko/lua-language-server/issues/844)
diff --git a/package.json b/package.json
index b4d7417a7c1ecb5b4b7fec00d2e404ed9c19e66a..fa16c0deef6096925cbabe7943292019e75784e8 100644
--- a/package.json
+++ b/package.json
@@ -1588,5 +1588,5 @@
         "type": "git",
         "url": "https://github.com/sumneko/lua-language-server"
     },
-    "version": "2.5.3"
+    "version": "2.5.4"
 }
diff --git a/package/build.lua b/package/build.lua
index 61e8dfbeb6a4be48183ab3f4c26bee48a74b6495..221624e67c013446e45202a577bbf10e658a44a9 100644
--- a/package/build.lua
+++ b/package/build.lua
@@ -1,6 +1,6 @@
 local json = require 'json-beautify'
 
-local VERSION = "2.5.3"
+local VERSION = "2.5.4"
 
 local package = require 'package.package'
 local fsu     = require 'fs-utility'
diff --git a/publish.lua b/publish.lua
index 46032ccee3276145bb1b45cc9bd4c4036b501d39..19adb3d424dd231607aeb786b54054fc625ad886 100644
--- a/publish.lua
+++ b/publish.lua
@@ -79,7 +79,7 @@ end
 
 local function runTest(root)
     local ext = platform.OS == 'Windows' and '.exe' or ''
-    local exe = root / 'bin' / platform.OS / 'lua-language-server' .. ext
+    local exe = root / 'bin' / 'lua-language-server' .. ext
     local test = root / 'test.lua'
     local lua = subprocess.spawn {
         exe,
diff --git a/server b/server
index 028460ed338a0ba582e5f755a9734ed65b290c0d..091be40543d0866cc37b10a4f76eeb2c86e4c2b1 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 028460ed338a0ba582e5f755a9734ed65b290c0d
+Subproject commit 091be40543d0866cc37b10a4f76eeb2c86e4c2b1