diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 22689c9c6405..12eaefe85903 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -115,7 +115,7 @@
 | ponylang | ✓ | ✓ | ✓ |  |
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
-| protobuf | ✓ |  | ✓ | `bufls`, `pb` |
+| protobuf | ✓ | ✓ | ✓ | `bufls`, `pb` |
 | prql | ✓ |  |  |  |
 | purescript | ✓ |  |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `pylsp` |
diff --git a/runtime/queries/protobuf/textobjects.scm b/runtime/queries/protobuf/textobjects.scm
new file mode 100644
index 000000000000..634fa4e4fef5
--- /dev/null
+++ b/runtime/queries/protobuf/textobjects.scm
@@ -0,0 +1,14 @@
+(rpc) @function.inside
+(rpc) @function.around
+
+(rpc
+    (enumMessageType) @parameter.inside)
+
+(message
+    (messageBody) @class.inside) @class.around
+
+(service
+    (serviceBody) @class.inside) @class.around
+
+(comment) @comment.inside
+(comment)+ @comment.around