diff --git a/queries/ruby/indents.scm b/queries/ruby/indents.scm
index 651395dc3..882a81574 100644
--- a/queries/ruby/indents.scm
+++ b/queries/ruby/indents.scm
@@ -12,6 +12,10 @@
   (array)
   (argument_list)
   (case)
+  (while)
+  (until)
+  (for)
+  (begin)
 ] @indent
 
 [
@@ -30,6 +34,7 @@
   "]"
   (when)
   (elsif)
+  (else)
   "end"
 ] @branch