diff --git a/bindings/go/binding_test.go b/bindings/go/binding_test.go
index fdabcd1..8d0b0dc 100644
--- a/bindings/go/binding_test.go
+++ b/bindings/go/binding_test.go
@@ -3,8 +3,8 @@ package tree_sitter_query_test
 import (
 	"testing"
 
-	tree_sitter "github.com/smacker/go-tree-sitter"
-	"github.com/tree-sitter-grammars/tree-sitter-query"
+	tree_sitter "github.com/tree-sitter/go-tree-sitter"
+	tree_sitter_query "github.com/tree-sitter-grammars/tree-sitter-query/bindings/go"
 )
 
 func TestCanLoadGrammar(t *testing.T) {
diff --git a/bindings/go/go.mod b/bindings/go/go.mod
deleted file mode 100644
index 10247b3..0000000
--- a/bindings/go/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module github.com/tree-sitter-grammars/tree-sitter-query
-
-go 1.22
-
-require github.com/smacker/go-tree-sitter v0.0.0-20230720070738-0d0a9f78d8f8
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..052f9ec
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,5 @@
+module github.com/tree-sitter-grammars/tree-sitter-query
+
+go 1.22
+
+require github.com/tree-sitter/go-tree-sitter v0.23.1
diff --git a/package.json b/package.json
index 15bd6d9..3e4d2be 100644
--- a/package.json
+++ b/package.json
@@ -53,16 +53,5 @@
     "test": "make test",
     "version": "make -s update",
     "prebuildify": "prebuildify --napi --strip"
-  },
-  "tree-sitter": [
-    {
-      "scope": "source.query",
-      "injection-regex": "^query$",
-      "highlights": "queries/query/highlights.scm",
-      "injections": "queries/query/injections.scm",
-      "file-types": [
-        "scm"
-      ]
-    }
-  ]
-}
+  }
+}
\ No newline at end of file
diff --git a/tree-sitter.json b/tree-sitter.json
new file mode 100644
index 0000000..064b104
--- /dev/null
+++ b/tree-sitter.json
@@ -0,0 +1,40 @@
+{
+  "grammars": [
+    {
+      "name": "query",
+      "camelcase": "Query",
+      "scope": "source.query",
+      "path": ".",
+      "file-types": [
+        "scm"
+      ],
+      "highlights": "queries/query/highlights.scm",
+      "injections": "queries/query/injections.scm",
+      "injection-regex": "^query$"
+    }
+  ],
+  "metadata": {
+    "version": "0.4.0",
+    "license": "Apache-2.0",
+    "description": "TS query grammar for tree-sitter",
+    "authors": [
+      {
+        "name": "Steven Sojka"
+      },
+      {
+        "name": "Stephan Seitz"
+      }
+    ],
+    "links": {
+      "repository": "https://github.com/tree-sitter-grammars/tree-sitter-query"
+    }
+  },
+  "bindings": {
+    "c": true,
+    "go": true,
+    "node": true,
+    "python": true,
+    "rust": true,
+    "swift": true
+  }
+}
\ No newline at end of file