diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb
index ec41532e..060b8f65 100644
--- a/middleman-core/lib/middleman-core/util/data.rb
+++ b/middleman-core/lib/middleman-core/util/data.rb
@@ -24,10 +24,10 @@ module Middleman::Util::Data
     end
 
     /
-      \A(.*?coding:.*?\r?\n)?
-      (?<start>[-;]{3})[ ]*\r?\n
+      \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
+      (?<start>---|;;;)[ ]*\r?\n
       (?<frontmatter>.*?)[ ]*\r?\n?
-      (?<stop>^[-.;]{3})[ ]*\r?\n?
+      ^(?<stop>---|\.\.\.|;;;)[ ]*\r?\n?
       \r?\n?
       (?<additional_content>.*)
     /mx =~ content