diff --git a/README.md b/README.md
index 93123af46..0d9ee970c 100644
--- a/README.md
+++ b/README.md
@@ -296,6 +296,7 @@ List of currently supported languages:
 - [ ] jsdoc
 - [x] dart (maintained by @Akin909)
 - [x] rst (maintained by @stsewd)
+- [x] tree-sitter query language (maintained by @steelsojka)
 
 ## User Query Extensions
 
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 819cdd3f8..72b68eb4c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -236,6 +236,13 @@ list.jsdoc = {
   }
 }
 
+list.scheme = {
+  install_info = {
+    url = "https://github.com/nvim-treesitter/tree-sitter-scheme",
+    files = { "src/parser.c" }
+  }
+}
+
 local M = {
   list = list
 }
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
new file mode 100644
index 000000000..a3816b6ac
--- /dev/null
+++ b/queries/scheme/highlights.scm
@@ -0,0 +1,8 @@
+(string) @string
+(capture) @type
+(anonymous_node) @string
+(named_node
+  name: (identifier) @variable
+  (field_definition
+    name: (identifier) @property))
+(comment) @comment
diff --git a/queries/scheme/locals.scm b/queries/scheme/locals.scm
new file mode 100644
index 000000000..7d11f52b9
--- /dev/null
+++ b/queries/scheme/locals.scm
@@ -0,0 +1 @@
+(identifier) @reference