diff --git a/.gitmodules b/.gitmodules
index d843e72..250871f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "external/lexy"]
 	path = external/lexy
 	url = https://github.com/foonathan/lexy.git
+[submodule "external/tree-sitter"]
+	path = external/tree-sitter
+	url = https://github.com/tree-sitter/tree-sitter.git
+[submodule "external/tree-sitter-org"]
+	path = external/tree-sitter-org
+	url = git@git.casenave.fr:floss/tree-sitter-org.git
diff --git a/external/tree-sitter b/external/tree-sitter
new file mode 160000
index 0000000..e3b85fd
--- /dev/null
+++ b/external/tree-sitter
@@ -0,0 +1 @@
+Subproject commit e3b85fd0d53efb71b4b70c0696ae54fb8c4d39ca
diff --git a/external/tree-sitter-org b/external/tree-sitter-org
new file mode 160000
index 0000000..5169a6f
--- /dev/null
+++ b/external/tree-sitter-org
@@ -0,0 +1 @@
+Subproject commit 5169a6f811c100ca2a36cffc41626f3a3c4ba729