diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index eebfb69..ee911cc 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -108,8 +108,8 @@ if !exists('b:surround_5')
   let b:surround_5 = "<% \r %>\n<% end %>"
 endif
 
-setlocal comments=:<%#
-setlocal commentstring=<%#\ %s\ %>
+setlocal comments=:<%!--
+setlocal commentstring=<%!--\ %s\ --%>
 
 let b:undo_ftplugin = "setl cms< " .
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index edb15c6..0f94b0c 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -62,7 +62,7 @@ exe 'syn region  surfaceExpression matchgroup=surfaceDelimiter start="{{" end="}
 exe 'syn region  surfaceExpression matchgroup=surfaceDelimiter start="{" end="}" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
 exe 'syn region  surfaceExpression matchgroup=surfaceDelimiter start="{" end="}" skip="#{[^}]*}" contains=@elixirTop  containedin=htmlValue keepend'
 exe 'syn region  eelixirQuote      matchgroup=eelixirDelimiter start="<%%" end="%\@<!%>" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
-exe 'syn region  eelixirComment    matchgroup=eelixirDelimiter start="<%#" end="%\@<!%>" contains=elixirTodo,@Spell containedin=ALLBUT,@eelixirRegions keepend'
+exe 'syn region  eelixirComment    matchgroup=eelixirDelimiter start="<%!--" end="%\@<!--%>"'
 
 " Define the default highlighting.
 
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 01660e7..065b3b7 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -126,7 +126,7 @@ syn region heexComponent matchgroup=eelixirDelimiter start="<\.[a-z_]\+"  end="%
 syn region eelixirExpression matchgroup=eelixirDelimiter start="<%"  end="%\@<!%>" contains=ALLBUT,@elixirNotTop containedin=@elixirTemplateSigils keepend
 syn region eelixirExpression matchgroup=eelixirDelimiter start="<%=" end="%\@<!%>" contains=ALLBUT,@elixirNotTop containedin=@elixirTemplateSigils keepend
 syn region eelixirQuote matchgroup=eelixirDelimiter start="<%%" end="%\@<!%>" contains=ALLBUT,@elixirNotTop containedin=@elixirTemplateSigils keepend
-syn region heexComment matchgroup=eelixirDelimiter start="<%!--" end="%\@<!--%>" contains=elixirTodo,eelixirComment,@Spell containedin=@elixirTemplateSigils keepend
+syn region heexComment matchgroup=eelixirDelimiter start="<%!--"ms=s-1 end="%\@<!--%>"me=e+1 containedin=@HTML,@elixirTemplateSigils keepend
 syn region heexExpression matchgroup=heexDelimiter start="=\zs{" end="}" contains=ALLBUT,@elixirNotTop containedin=htmlValue keepend
 syn region heexExpression matchgroup=heexDelimiter start="=\zs{" end="}" skip="#{[^}]*}" contains=ALLBUT,@elixirNotTop containedin=htmlValue keepend
 " missing `keepend` on next line is intentional