diff --git a/lib/rouge/lexers/eex.rb b/lib/rouge/lexers/eex.rb
index f51e1f5497..2c3784ce0d 100644
--- a/lib/rouge/lexers/eex.rb
+++ b/lib/rouge/lexers/eex.rb
@@ -29,20 +29,20 @@ def initialize(opts={})
 
         rule open, Comment::Preproc, :elixir
 
-        rule %r/.+?(?=#{open})|.+/m do
+        rule %r/.+?(?=#{open})|.+/mo do
           delegate parent
         end
       end
 
       state :comment do
         rule close, Comment, :pop!
-        rule %r/./, Comment
+        rule /.+?(?=#{close})|.+/mo, Comment
       end
 
       state :elixir do
         rule close, Comment::Preproc, :pop!
 
-        rule %r/.+?(?=#{close})|.+/m do
+        rule %r/.+?(?=#{close})|.+/mo do
           delegate @elixir_lexer
         end
       end