diff --git a/ChangeLog.md b/ChangeLog.md
index d675f5565..4cf85a6d4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,13 @@
 # Revision history for haskell-lsp
 
+## 0.18.0.0 -- 2019-11-14
+
+* Virtual file fixes, removing race conditions and other cleanups (@mpickering)
+* Add missing fmClientPrepareRenameRequest to MessageFuncs export (@alanz)
+* Make explicit GHC 8.6.5 stack file (@alanz)
+* Rework Core.Options and infer all server capabilities from handlers (@bubba)
+* Generate lenses for WorkDoneProgress data types (@alanz)
+
 ## 0.17.0.0 -- 2019-10-18
 
 * Update progress reporting to match the LSP 3.15 specification (@cocreature)
diff --git a/haskell-lsp-types/ChangeLog.md b/haskell-lsp-types/ChangeLog.md
index 1a08b6da3..8a581fa75 100644
--- a/haskell-lsp-types/ChangeLog.md
+++ b/haskell-lsp-types/ChangeLog.md
@@ -1,5 +1,11 @@
 # Revision history for haskell-lsp-types
 
+## 0.18.0.0 -- 2019-11-14
+
+* Add missing fmClientPrepareRenameRequest to MessageFuncs export (@alanz)
+* Rework Core.Options and infer all server capabilities from handlers (@bubba)
+* Generate lenses for WorkDoneProgress data types (@alanz)
+
 ## 0.17.0.0 -- 2019-10-18
 
 * Update progress reporting to match the LSP 3.15 specification (@cocreature)
diff --git a/haskell-lsp-types/haskell-lsp-types.cabal b/haskell-lsp-types/haskell-lsp-types.cabal
index 6910399cd..a9e69d49a 100644
--- a/haskell-lsp-types/haskell-lsp-types.cabal
+++ b/haskell-lsp-types/haskell-lsp-types.cabal
@@ -1,5 +1,5 @@
 name:                haskell-lsp-types
-version:             0.17.0.0
+version:             0.18.0.0
 synopsis:            Haskell library for the Microsoft Language Server Protocol, data types
 
 description:         An implementation of the types to allow language implementors to
diff --git a/haskell-lsp.cabal b/haskell-lsp.cabal
index 744d4ac19..5772f4790 100644
--- a/haskell-lsp.cabal
+++ b/haskell-lsp.cabal
@@ -1,5 +1,5 @@
 name:                haskell-lsp
-version:             0.17.0.0
+version:             0.18.0.0
 synopsis:            Haskell library for the Microsoft Language Server Protocol
 
 description:         An implementation of the types, and basic message server to
@@ -46,7 +46,7 @@ library
                      , filepath
                      , hslogger
                      , hashable
-                     , haskell-lsp-types == 0.17.*
+                     , haskell-lsp-types == 0.18.*
                      , lens >= 4.15.2
                      , mtl
                      , network-uri