diff --git a/lib/middleman/features/default_helpers.rb b/lib/middleman/features/default_helpers.rb
index 58ca72dd..e431c8b7 100644
--- a/lib/middleman/features/default_helpers.rb
+++ b/lib/middleman/features/default_helpers.rb
@@ -50,7 +50,7 @@ module Middleman::Features::DefaultHelpers
          else kind.to_s
        end
        source = source.to_s.gsub(/\s/, '')
-       ignore_extension = (asset_folder.to_s == kind.to_s) # don't append extension
+       ignore_extension = (kind == :images) # don't append extension
        source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
        result_path   = source if source =~ %r{^/} # absolute path
        result_path ||= asset_url(source, asset_folder)
diff --git a/lib/middleman/features/front_matter.rb b/lib/middleman/features/front_matter.rb
index 0db76884..f666df84 100644
--- a/lib/middleman/features/front_matter.rb
+++ b/lib/middleman/features/front_matter.rb
@@ -6,12 +6,15 @@ module Middleman::Features::FrontMatter
     def registered(app)
       app.extend ClassMethods
       
+      ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register BlueClothTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
       ::Tilt::register RedClothTemplate, 'textile'
+      ::Tilt::register ERBTemplate,    'erb', 'rhtml'
+      ::Tilt::register ErubisTemplate, 'erb', 'rhtml', 'erubis'
     end
     alias :included :registered
   end
@@ -66,4 +69,13 @@ module Middleman::Features::FrontMatter
   class RedClothTemplate < ::Tilt::RedClothTemplate
     include Middleman::Features::FrontMatter::YamlAware
   end
+
+  # ERb
+  class ERBTemplate < ::Tilt::ERBTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
+  
+  class ErubisTemplate < ::Tilt::ErubisTemplate
+    include Middleman::Features::FrontMatter::YamlAware
+  end
 end
\ No newline at end of file