diff --git a/VERSION b/VERSION
index 73d74673c..744068368 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.0
\ No newline at end of file
+1.18.0
\ No newline at end of file
diff --git a/messages.json b/messages.json
index 1eb61b8e6..f73ef68e1 100644
--- a/messages.json
+++ b/messages.json
@@ -12,6 +12,7 @@
     "1.16.2": "messages/1.16.2.txt",
     "1.16.3": "messages/1.16.3.txt",
     "1.17.0": "messages/1.17.0.txt",
+    "1.18.0": "messages/1.18.0.txt",
     "1.2.7": "messages/1.2.7.txt",
     "1.2.8": "messages/1.2.8.txt",
     "1.2.9": "messages/1.2.9.txt",
diff --git a/messages/1.18.0.txt b/messages/1.18.0.txt
new file mode 100644
index 000000000..6680360d4
--- /dev/null
+++ b/messages/1.18.0.txt
@@ -0,0 +1,16 @@
+=> 1.18.0
+
+# Features and Fixes
+
+- Implement inlay hints (#2018) (predragnikolic & jwortmann) (documentation: https://lsp.sublimetext.io/features/#inlay-hints)
+- Add option to highlight hover range (#2030) (jwortmann)
+- Optionally fallback to goto_reference in lsp_symbol_references (#2029) (timfjord)
+- Delay re-calculation of code lenses and inlay hints for currently not visible views (#2025) (jwortmann)
+- Improve strategy for semantic highlighting requests (#2020) (jwortmann)
+- Follow global settings more accurately whether to show snippet completions (#2017) (jwortmann)
+- docs: Add ruby steep language server (#2019) (jalkoby)
+- docs: Update F# guidance (#2011) (baronfel)
+
+# API changes
+
+- Define overridable methods in LspExecuteCommand (#2024) (rchl)
diff --git a/plugin/core/version.py b/plugin/core/version.py
index 0d9ab3688..214022177 100644
--- a/plugin/core/version.py
+++ b/plugin/core/version.py
@@ -1 +1 @@
-__version__ = (1, 17, 0)
+__version__ = (1, 18, 0)