diff --git a/aider/queries/tree-sitter-languages/zig-tags.scm b/aider/queries/tree-sitter-languages/zig-tags.scm
new file mode 100644
index 000000000..c02028ea8
--- /dev/null
+++ b/aider/queries/tree-sitter-languages/zig-tags.scm
@@ -0,0 +1,3 @@
+(FnProto) @name.definition.function
+(VarDecl "const" @name.definition.constant)
+(VarDecl "var"   @name.definition.variable)
diff --git a/tests/basic/test_repomap.py b/tests/basic/test_repomap.py
index 185e6e62d..2c965bdff 100644
--- a/tests/basic/test_repomap.py
+++ b/tests/basic/test_repomap.py
@@ -334,6 +334,9 @@ class TestRepoMapAllLanguages(unittest.TestCase):
     def test_language_tsx(self):
         self._test_language_repo_map("tsx", "tsx", "UserProps")
 
+    def test_language_zig(self):
+        self._test_language_repo_map("zig", "zig", "add")
+
     def test_language_csharp(self):
         self._test_language_repo_map("csharp", "cs", "IGreeter")
 
diff --git a/tests/fixtures/languages/zig/test.zig b/tests/fixtures/languages/zig/test.zig
new file mode 100644
index 000000000..3cebad3a0
--- /dev/null
+++ b/tests/fixtures/languages/zig/test.zig
@@ -0,0 +1,10 @@
+const std = @import("std");
+
+pub fn add(a: i32, b: i32) i32 {
+    return a + b;
+}
+
+pub fn main() !void {
+    const stdout = std.io.getStdOut().writer();
+    try stdout.print("{}", .{add(2, 3)});
+}