diff --git a/lib/middleman/core_extensions/front_matter.rb b/lib/middleman/core_extensions/front_matter.rb
index 3ac38039..ebb37385 100644
--- a/lib/middleman/core_extensions/front_matter.rb
+++ b/lib/middleman/core_extensions/front_matter.rb
@@ -18,6 +18,9 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt::register ERBTemplate,       'erb', 'rhtml'
       ::Tilt.prefer(ERBTemplate)
       
+      ::Tilt::register LiquidTemplate,    'liquid'
+      ::Tilt.prefer(LiquidTemplate)
+      
       ::Tilt::register SlimTemplate,      'slim'
       ::Tilt.prefer(SlimTemplate)
       
@@ -102,6 +105,10 @@ module Middleman::CoreExtensions::FrontMatter
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
 
+  class LiquidTemplate < ::Tilt::LiquidTemplate
+    include Middleman::CoreExtensions::FrontMatter::YamlAware
+  end
+
   class HamlTemplate < ::Tilt::HamlTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end