diff --git a/.gitmodules b/.gitmodules
index eda390f3..32c92e0b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "vendor/ocaml-lsp"]
-	path = vendor/ocaml-lsp
-	url = https://github.com/giltho/ocaml-lsp.git
+[submodule "submodules/ocaml-lsp"]
+	path = submodules/ocaml-lsp
+	url = https://github.com/ocaml/ocaml-lsp.git
diff --git a/dune b/dune
index 94865487..171ef1c3 100644
--- a/dune
+++ b/dune
@@ -1 +1 @@
-(vendored_dirs vendor)
+(data_only_dirs submodules)
diff --git a/submodules/ocaml-lsp b/submodules/ocaml-lsp
new file mode 160000
index 00000000..aae69863
--- /dev/null
+++ b/submodules/ocaml-lsp
@@ -0,0 +1 @@
+Subproject commit aae6986391a8519de3da6a7a341f2bd3376e0d2f
diff --git a/vendor/jsonrpc/dune b/vendor/jsonrpc/dune
new file mode 100644
index 00000000..28e23310
--- /dev/null
+++ b/vendor/jsonrpc/dune
@@ -0,0 +1,5 @@
+(copy_files %{project_root}/submodules/ocaml-lsp/jsonrpc/src/*.{ml,mli})
+
+(library
+ (name jsonrpc)
+ (public_name linol.jsonrpc))
diff --git a/vendor/lsp/dune b/vendor/lsp/dune
new file mode 100644
index 00000000..d67c7436
--- /dev/null
+++ b/vendor/lsp/dune
@@ -0,0 +1,14 @@
+(copy_files %{project_root}/submodules/ocaml-lsp/lsp/src/*.{ml,mli,mll})
+
+(library
+ (name lsp)
+ (public_name linol.lsp)
+ (libraries jsonrpc ppx_yojson_conv_lib uutf yojson)
+ (lint
+  (pps ppx_yojson_conv)))
+
+(cinaps
+ (files types.ml types.mli)
+ (libraries lsp_gen))
+
+(ocamllex uri_lexer)
diff --git a/vendor/ocaml-lsp b/vendor/ocaml-lsp
deleted file mode 160000
index c9b55bcb..00000000
--- a/vendor/ocaml-lsp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c9b55bcbb5471c6f1954bd82a8597b489e28cad7