diff --git a/ChangeLog.md b/ChangeLog.md
index 3fc7e97de..fca8a17f9 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,11 +1,22 @@
 # Revision history for haskell-lsp
 
+## 0.21.0.0
+
+* Stop getCompletionPrefix from crashing if beforePos is empty
+* Add DidChangeWatchedFilesRegistrationOptions
+* Add NormalizedFilePath from ghcide
+* Add diagnostic and completion tags
+* Fix language server example
+* Correctly fix the problem with '$/' notifications
+* Add azure ci
+
 ## 0.20.0.1
 
 * Fix Haddock generation syntax error
 
 ## 0.20.0.0
 
+* Force utf8 encoding when writing vfs temp files
 * Don't log errors for '$/' notifications (@jinwoo)
 * Force utf8 encoding when writing vfs temp files (@jneira)
 * Store a hash in a NormalizedUri (@mpickering)
diff --git a/haskell-lsp-types/ChangeLog.md b/haskell-lsp-types/ChangeLog.md
index 930610862..2c4a3b6a8 100644
--- a/haskell-lsp-types/ChangeLog.md
+++ b/haskell-lsp-types/ChangeLog.md
@@ -1,7 +1,18 @@
 # Revision history for haskell-lsp-types
 
+## 0.21.0.0
+
+* Stop getCompletionPrefix from crashing if beforePos is empty
+* Add DidChangeWatchedFilesRegistrationOptions
+* Add NormalizedFilePath from ghcide
+* Add diagnostic and completion tags
+* Fix language server example
+* Correctly fix the problem with '$/' notifications
+* Add azure ci
+
 ## 0.20.0.0
 
+* Force utf8 encoding when writing vfs temp files
 * Don't log errors for '$/' notifications (@jinwoo)
 * Force utf8 encoding when writing vfs temp files (@jneira)
 * Store a hash in a NormalizedUri (@mpickering)
diff --git a/haskell-lsp-types/haskell-lsp-types.cabal b/haskell-lsp-types/haskell-lsp-types.cabal
index de5bd0cc7..55ea1c98c 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.20.0.0
+version:             0.21.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 14c1ad04c..75962ba0f 100644
--- a/haskell-lsp.cabal
+++ b/haskell-lsp.cabal
@@ -1,5 +1,5 @@
 name:                haskell-lsp
-version:             0.20.0.1
+version:             0.21.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.20.*
+                     , haskell-lsp-types == 0.21.*
                      , lens >= 4.15.2
                      , mtl
                      , network-uri