diff --git a/.gitignore b/.gitignore
index 5f83ac024..98b733398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 /examples/qtdeclarative
 /node_modules/
 /package-lock.json
+/queries/highlights-javascript.scm
+/queries/highlights-typescript.scm
 /target/
 
 # Workaround for https://github.com/tree-sitter/tree-sitter/issues/730
diff --git a/Makefile b/Makefile
index 6c1272c00..aa668e00e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,16 @@ help:
 
 .PHONY: generate
 generate:
+	$(MAKE) queries/highlights-javascript.scm queries/highlights-typescript.scm
 	$(MAKE) src/typescript-scanner.h
 	$(TREE_SITTER) generate
 
+# create symlinks out of sub packages so cargo can pick them up
+queries/highlights-javascript.scm: node_modules/tree-sitter-javascript/queries/highlights.scm
+	ln -sf ../$< $@
+queries/highlights-typescript.scm: node_modules/tree-sitter-typescript/queries/highlights.scm
+	ln -sf ../$< $@
+
 src/typescript-scanner.h: \
  node_modules/tree-sitter-typescript/common/scanner.h \
  node_modules/tree-sitter-typescript/LICENSE \
diff --git a/bindings/rust/lib.rs b/bindings/rust/lib.rs
index c48df762c..f88f3b85d 100644
--- a/bindings/rust/lib.rs
+++ b/bindings/rust/lib.rs
@@ -35,9 +35,13 @@ pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
 
 // Uncomment these to include any queries that this grammar contains
 
-// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
+pub const HIGHLIGHTS_QUERY: &'static str = concat!(
+    include_str!("../../queries/highlights.scm"),
+    include_str!("../../queries/highlights-typescript.scm"),
+    include_str!("../../queries/highlights-javascript.scm"),
+);
 // pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
-// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
+pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
 // pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
 
 #[cfg(test)]