diff --git a/CHANGES.md b/CHANGES.md
index ba2e04beb..e1749bd08 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,10 +1,10 @@
-# Unreleased
+# 1.21.0
 
 ## Features
 
 - Add a new server option `standardHover`, that can be used by clients to
   disable the default hover provider.  When `standardHover = false`
-  `textDocument/hover` requests always returns with empty result.
+  `textDocument/hover` requests always returns with empty result. (#1416)
 
 # 1.20.1
 
diff --git a/jsonrpc.opam b/jsonrpc.opam
index 8c5eaf038..727f04efe 100644
--- a/jsonrpc.opam
+++ b/jsonrpc.opam
@@ -37,3 +37,5 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+
+x-maintenance-intent: [ "(latest)" "(latest)-414" ]
diff --git a/lsp.opam b/lsp.opam
index bcd2920b2..8a2d84478 100644
--- a/lsp.opam
+++ b/lsp.opam
@@ -48,3 +48,5 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+
+x-maintenance-intent: [ "(latest)" "(latest)-414" ]
diff --git a/lsp.opam.template b/lsp.opam.template
index 44877d421..523b4c046 100644
--- a/lsp.opam.template
+++ b/lsp.opam.template
@@ -11,3 +11,5 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+
+x-maintenance-intent: [ "(latest)" "(latest)-414" ]
diff --git a/ocaml-lsp-server.opam b/ocaml-lsp-server.opam
index 4ba372eec..0ea34162c 100644
--- a/ocaml-lsp-server.opam
+++ b/ocaml-lsp-server.opam
@@ -62,3 +62,5 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+
+x-maintenance-intent: [ "(latest)" "(latest)-414" ]