diff --git a/.gitmodules b/.gitmodules
index 7b334c532..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "tree-sitter"]
-	path = tree-sitter
-	url = https://github.com/tree-sitter/tree-sitter.git
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 000000000..20f7d8344
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "TreeSitter",
+        "repositoryURL": "https://github.com/tree-sitter/tree-sitter",
+        "state": {
+          "branch": null,
+          "revision": "9fd128ed604bb63348281bd4ac0d99705e713147",
+          "version": null
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
index 3e810ddbf..2cffb307c 100644
--- a/Package.swift
+++ b/Package.swift
@@ -12,33 +12,14 @@ let package = Package(
     products: [
         .library(name: "Runestone", targets: ["Runestone"])
     ],
+    dependencies: [
+        // Pins tree-sitter to the merge commit when SPM was added. This will be changed to pin to a release, when a release is created that includes SPM.
+        .package(url: "https://github.com/tree-sitter/tree-sitter", .revision("9fd128ed604bb63348281bd4ac0d99705e713147"))
+    ],
     targets: [
-        .target(name: "Runestone",
-                dependencies: ["TreeSitter"],
-                resources: [.process("TextView/Appearance/Theme.xcassets")]),
-        .target(name: "TreeSitter",
-                path: "tree-sitter/lib",
-                exclude: [
-                    "binding_rust",
-                    "binding_web",
-                    "Cargo.toml",
-                    "README.md",
-                    "src/unicode/README.md",
-                    "src/unicode/LICENSE",
-                    "src/unicode/ICU_SHA",
-                    "src/get_changed_ranges.c",
-                    "src/tree_cursor.c",
-                    "src/stack.c",
-                    "src/node.c",
-                    "src/lexer.c",
-                    "src/parser.c",
-                    "src/language.c",
-                    "src/alloc.c",
-                    "src/subtree.c",
-                    "src/tree.c",
-                    "src/query.c"
-                ],
-                sources: ["src/lib.c"]),
+        .target(name: "Runestone", dependencies: [
+            .product(name: "TreeSitter", package: "tree-sitter")
+        ], resources: [.process("TextView/Appearance/Theme.xcassets")]),
         .target(name: "TestTreeSitterLanguages", cSettings: [.unsafeFlags(["-w"])]),
         .testTarget(name: "RunestoneTests", dependencies: ["Runestone", "TestTreeSitterLanguages"])
     ]
diff --git a/tree-sitter b/tree-sitter
deleted file mode 160000
index b268e412a..000000000
--- a/tree-sitter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b268e412ad4848380166af153300464e5a1cf83f