diff --git a/changelog.md b/changelog.md
index 02ef0f4a60b3e4e8a75dd180edb0b3cd49ded36a..b5e44501edb4b9550ff5c12897ac2c98e1c4e7bc 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,18 @@
 # changelog
 
+## 3.6.2
+`2022-11-10`
+* `FIX` incorrect type check for generic with nil
+* `FIX` [#1676]
+* `FIX` [#1677]
+* `FIX` [#1679]
+* `FIX` [#1680]
+
+[#1676]: https://github.com/sumneko/lua-language-server/issues/1676
+[#1677]: https://github.com/sumneko/lua-language-server/issues/1677
+[#1679]: https://github.com/sumneko/lua-language-server/issues/1679
+[#1680]: https://github.com/sumneko/lua-language-server/issues/1680
+
 ## 3.6.1
 `2022-11-8`
 * `FIX` wrong diagnostics for `pcall` and `xpcall`
diff --git a/package.json b/package.json
index 5b4e48ceedd530c680a041c9b771577b50cb1f84..6f572d76aa9a5a6134ce181d05b1f149f2bd0b7d 100644
--- a/package.json
+++ b/package.json
@@ -3072,5 +3072,5 @@
 	"sponsor": {
 		"url": "https://github.com/sumneko/lua-language-server/issues/484"
 	},
-	"version": "3.6.1"
+	"version": "3.6.2"
 }
diff --git a/package/build.lua b/package/build.lua
index a26397748e94e183368da8917ffec957431ccdc7..20375a30dbfb463bc3c44a7226267ffcffa0be17 100644
--- a/package/build.lua
+++ b/package/build.lua
@@ -1,6 +1,6 @@
 local json = require 'json-beautify'
 
-local VERSION = "3.6.1"
+local VERSION = "3.6.2"
 
 local package = require 'package.package'
 local fsu     = require 'fs-utility'
diff --git a/server b/server
index 442da6b179af08d5c15ae1a66ea9ff37e627fc64..9e61b29f8039fc7c41c792ad69c1df5d21e864fd 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 442da6b179af08d5c15ae1a66ea9ff37e627fc64
+Subproject commit 9e61b29f8039fc7c41c792ad69c1df5d21e864fd