diff --git a/languages.toml b/languages.toml
index c40b0d503..47d77feed 100644
--- a/languages.toml
+++ b/languages.toml
@@ -831,7 +831,7 @@ injection-regex = "cmake"
 
 [[grammar]]
 name = "cmake"
-source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "f6616f1e417ee8b62daf251aa1daa5d73781c596" }
+source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef3052dd3b328322c22172eda093727ad" }
 
 [[language]]
 name = "make"
diff --git a/runtime/queries/cmake/textobjects.scm b/runtime/queries/cmake/textobjects.scm
index 1fa9ded5b..049aa84ab 100644
--- a/runtime/queries/cmake/textobjects.scm
+++ b/runtime/queries/cmake/textobjects.scm
@@ -1,4 +1,7 @@
-(macro_def) @function.around
+[
+  (macro_def)
+  (function_def)
+] @function.around
 
 (argument) @parameter.inside