diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index deb56bbf4..e6fc09140 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -303,6 +303,13 @@ list.vue = {
   }
 }
 
+list.jsonc = {
+  install_info = {
+    url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git",
+    files = { "src/parser.c" },
+  }
+}
+
 list.elm = {
   install_info = {
     url = "https://github.com/elm-tooling/tree-sitter-elm",
diff --git a/queries/jsonc/folds.scm b/queries/jsonc/folds.scm
new file mode 100644
index 000000000..41269219e
--- /dev/null
+++ b/queries/jsonc/folds.scm
@@ -0,0 +1 @@
+; inherits: json
diff --git a/queries/jsonc/highlights.scm b/queries/jsonc/highlights.scm
new file mode 100644
index 000000000..a51c5c7e7
--- /dev/null
+++ b/queries/jsonc/highlights.scm
@@ -0,0 +1,3 @@
+; inherits: json
+
+(comment) @comment
diff --git a/queries/jsonc/indents.scm b/queries/jsonc/indents.scm
new file mode 100644
index 000000000..41269219e
--- /dev/null
+++ b/queries/jsonc/indents.scm
@@ -0,0 +1 @@
+; inherits: json
diff --git a/queries/jsonc/locals.scm b/queries/jsonc/locals.scm
new file mode 100644
index 000000000..41269219e
--- /dev/null
+++ b/queries/jsonc/locals.scm
@@ -0,0 +1 @@
+; inherits: json