diff --git a/.gitignore b/.gitignore
index 9363c37..7d5b7a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /build
 /node_modules
-/tree-sitter
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..49a6187
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "tree-sitter"]
+	path = tree-sitter
+	url = https://github.com/ikatyang/tree-sitter
+	branch = 0.16.7-custom
diff --git a/scripts/setup-tree-sitter.sh b/scripts/setup-tree-sitter.sh
index acbedca..1299e58 100644
--- a/scripts/setup-tree-sitter.sh
+++ b/scripts/setup-tree-sitter.sh
@@ -1,5 +1,4 @@
-git clone https://github.com/ikatyang/tree-sitter --branch 0.16.7-custom --depth 1
-cd tree-sitter
 git submodule update --init
+cd tree-sitter
 ./script/build-wasm
 cargo build --release
diff --git a/tree-sitter b/tree-sitter
new file mode 160000
index 0000000..cd58070
--- /dev/null
+++ b/tree-sitter
@@ -0,0 +1 @@
+Subproject commit cd580709f15f145601f40e6643af99befb8ce635