diff --git a/lib/middleman/core_extensions/front_matter.rb b/lib/middleman/core_extensions/front_matter.rb
index 1994e8ab..b283c621 100644
--- a/lib/middleman/core_extensions/front_matter.rb
+++ b/lib/middleman/core_extensions/front_matter.rb
@@ -9,6 +9,7 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
       app.set :markdown_engine, MarukuTemplate
       
       ::Tilt::register RedClothTemplate,  'textile'
@@ -93,6 +94,9 @@ module Middleman::CoreExtensions::FrontMatter
   class RedClothTemplate < ::Tilt::RedClothTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
+  class KramdownTemplate < ::Tilt::KramdownTemplate
+    include Middleman::CoreExtensions::FrontMatter::YamlAware
+  end
  
   class ERBTemplate < ::Tilt::ERBTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware