diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2cc527..b723e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 See the full list of recent releases and features added on the [Github releases page](https://github.com/PranayAgarwal/vscode-hack/releases).
 
+## v0.6.0 - 2017-11-19
+- Experimental Language Server support:
+  - If you are running HHVM 3.23 or later, add `"hack.useLanguageServer": true` to your workspace config to start hh_client in Language Server mode (see [#15](https://github.com/PranayAgarwal/vscode-hack/issues/15) for more context).
+- Support for running against a containerized Hack typecheck server (see Docker section in README). Thanks [@beatscode](https://github.com/beatscode)!
+- Fixed [#13](https://github.com/PranayAgarwal/vscode-hack/issues/13) - Running formatter removes last line of file if there is no trailing newline. Thanks [@beefsack](https://github.com/beefsack)!
+- Updated Hack language grammar to latest version.
+- Development changes:
+  - Bumped up minimum supported VS Code engine version to 1.15.0 for better extension API compatibility.
+  - Project is now compiled in TypeScript strict mode.
+
 ## v0.5.0 - 2017-04-06
 - Added Code Actions to automatically suppress typechecker errors via HH_FIXME comments.
 
diff --git a/README.md b/README.md
index 066a8ab..38b0bde 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,11 @@ It is published in the Visual Studio Marketplace [here](https://marketplace.visu
 
 ## Latest releases
 
+## v0.6.0
+- Experimental Language Server support - If you are running HHVM 3.23 or later, add `"hack.useLanguageServer": true` to your workspace config to start hh_client in Language Server mode (see [#15](https://github.com/PranayAgarwal/vscode-hack/issues/15) for more context).
+- Support for running against a containerized Hack typecheck server (see Docker section in README). Thanks [@beatscode](https://github.com/beatscode)!
+- Fixed [#13](https://github.com/PranayAgarwal/vscode-hack/issues/13) - Running formatter removes last line of file if there is no trailing newline. Thanks [@beefsack](https://github.com/beefsack)!
+
 ### v0.5.0
 - Added Code Actions to automatically suppress typechecker errors via HH_FIXME comments.
 
@@ -45,6 +50,22 @@ This extension adds the following Visual Studio Code settings. These can be set
 * `hack.clientPath`: Absolute path to the hh_client executable. This can be left empty if hh_client is already in your environment $PATH. A `docker exec` command is supported as well.
 * `hack.workspaceRootPath`: Absolute path to the workspace root directory. This will be the VS Code workspace root by default, but can be changed if the project is in a subdirectory or mounted in a Docker container.
 * `hack.enableCoverageCheck`: Enable calculation of Hack type coverage percentage for every file and display in status bar (default: `false`).
+* `hack.useLanguageServer`: [Experimental] Start hh_client in Language Server mode. Only works for HHVM version 3.23 and above (default: `false`).
+
+### Docker
+
+The extension can be used in a contanerized development environment. Simply configure `clientPath` to be a `docker exec` command and specify a `workspaceRootPath` mapping.
+
+E.g. if your container was started using
+```bash
+$ docker run -d -t --name my-hhvm -v /home/user/repos/project:/mnt/project hhvm/hhvm:latest
+```
+
+Configure
+```json
+"hack.clientPath": "docker exec -i my-hhvm hh_client",
+"hack.workspaceRootPath": "/mnt/project"
+```
 
 ## Issues
 
diff --git a/package.json b/package.json
index 4b278b1..011bd45 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-hack",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "publisher": "pranayagarwal",
   "engines": {
     "vscode": "^1.15.0"