diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9e47e0b6f..c27e1bdb8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -70,7 +70,14 @@ list.cpp = {
     files = { "src/parser.c", "src/scanner.cc" },
     generate_requires_npm = true,
   },
-  used_by = { "cuda" },
+  maintainers = {"@theHamsta"},
+}
+
+list.cuda = {
+  install_info = {
+    url = "https://github.com/theHamsta/tree-sitter-cuda",
+    files = {"src/parser.c", "src/scanner.cc"},
+  },
   maintainers = {"@theHamsta"},
 }
 
diff --git a/queries/cuda/folds.scm b/queries/cuda/folds.scm
new file mode 100644
index 000000000..b617fdc56
--- /dev/null
+++ b/queries/cuda/folds.scm
@@ -0,0 +1 @@
+; inherits: cpp
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
new file mode 100644
index 000000000..a4a334920
--- /dev/null
+++ b/queries/cuda/highlights.scm
@@ -0,0 +1,12 @@
+; inherits: cpp
+
+[ "<<<" ">>>" ] @punctuation.bracket
+
+[
+  "__local__"
+  "__shared__"
+  "__global__"
+  "__host__"
+  "__device__"
+  "__forceinline__"
+] @keyword
diff --git a/queries/cuda/indents.scm b/queries/cuda/indents.scm
new file mode 100644
index 000000000..b617fdc56
--- /dev/null
+++ b/queries/cuda/indents.scm
@@ -0,0 +1 @@
+; inherits: cpp
diff --git a/queries/cuda/locals.scm b/queries/cuda/locals.scm
new file mode 100644
index 000000000..b617fdc56
--- /dev/null
+++ b/queries/cuda/locals.scm
@@ -0,0 +1 @@
+; inherits: cpp