diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index ed6044280ea..fa51597697f 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -135,7 +135,8 @@ This should only be called after matching against `ruby-here-doc-beg-re'."
   "Regexp to match symbols.")
 
 (defconst ruby-endless-method-head-re
-  (format " *\\(self\\.\\)?%s+[?!]? *\\(([^()]*)\\)? +=" ruby-symbol-re)
+  (format " *\\(%s+\\.\\)?%s+[?!]? *\\(([^()]*)\\)? +="
+          ruby-symbol-re ruby-symbol-re)
   "Regexp to match the beginning of an endless method definition.
 
 It should match the part after \"def\" and until \"=\".")
diff --git a/test/lisp/progmodes/ruby-mode-resources/ruby.rb b/test/lisp/progmodes/ruby-mode-resources/ruby.rb
index 5636a4fc0e2..2451edaee22 100644
--- a/test/lisp/progmodes/ruby-mode-resources/ruby.rb
+++ b/test/lisp/progmodes/ruby-mode-resources/ruby.rb
@@ -533,6 +533,8 @@ def foo=(
         baz,
         bar
       )
-    hello
+    def baz.full_name = "#{bar} 3"
+
+    baz
   end
 end