diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd5e8f33..a05d2961 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## 2.6.0
+
+- Improved an error message
+
+- Update language server to 2.6.0
+  - Start using completion item label description for module name
+  - Add completions for destructured record patterns and ports
+  - Add function parameter record field completions
+  - Don't try to get code actions when there is a top level parsing error
+  - Fix move function refactor
+  - Fix expose being able to expose the same function multiple times
+  - Fix a bug with extract function parameter calculation
+  - Fix for reference count of function in a let, with a type annotation.
+  - Don't cache operator definitions, fixes a type inference error with `Parser.Advanced`
+
 ## 2.5.2
 
 - Update language server to 2.5.2
diff --git a/package-lock.json b/package-lock.json
index 11198f48..4bcbb58d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "elm-ls-vscode",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "elm-ls-vscode",
-      "version": "2.5.2",
+      "version": "2.6.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 0f6a461b..0f26c626 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "icon": "images/elm.png",
   "author": "Kolja Lampe",
   "license": "MIT",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/elm-tooling/elm-language-client-vscode"
diff --git a/server b/server
index 5ed3bdc5..3825f069 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 5ed3bdc51a146a18bb7b586daeb0209f6fdb4d1e
+Subproject commit 3825f069ce3e41266c66ef63432d5f042e2f0b2d