diff --git a/lib/middleman.rb b/lib/middleman.rb
index ddb121f4..8fd2bb0f 100755
--- a/lib/middleman.rb
+++ b/lib/middleman.rb
@@ -68,6 +68,8 @@ module Middleman
     autoload :Haml, "middleman/renderers/haml"
     autoload :Sass, "middleman/renderers/sass"
     autoload :Slim, "middleman/renderers/slim"
+    autoload :Markdown, "middleman/renderers/markdown"
+    autoload :CoffeeScript, "middleman/renderers/coffee_script"
   end
 
   # Features API
diff --git a/lib/middleman/features/front_matter.rb b/lib/middleman/features/front_matter.rb
index f666df84..5ebe693c 100644
--- a/lib/middleman/features/front_matter.rb
+++ b/lib/middleman/features/front_matter.rb
@@ -44,23 +44,7 @@ module Middleman::Features::FrontMatter
     end
   end
 
-  # MARKDOWN
-  class MarukuTemplate < ::Tilt::MarukuTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class KramdownTemplate < ::Tilt::KramdownTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class BlueClothTemplate < ::Tilt::BlueClothTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
-  class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
-    include Middleman::Features::FrontMatter::YamlAware
-  end
-  
+  # MARKDOWN  
   class RDiscountTemplate < ::Tilt::RDiscountTemplate
     include Middleman::Features::FrontMatter::YamlAware
   end
diff --git a/lib/middleman/renderers/coffee_script.rb b/lib/middleman/renderers/coffee_script.rb
new file mode 100644
index 00000000..3444f0d6
--- /dev/null
+++ b/lib/middleman/renderers/coffee_script.rb
@@ -0,0 +1,12 @@
+module Middleman
+  module Renderers
+    module CoffeeScript
+      class << self
+        def registered(app)
+          require "coffee_script"
+        end
+        alias :included :registered
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/middleman/renderers/markdown.rb b/lib/middleman/renderers/markdown.rb
new file mode 100644
index 00000000..b2dbe5ff
--- /dev/null
+++ b/lib/middleman/renderers/markdown.rb
@@ -0,0 +1,12 @@
+module Middleman
+  module Renderers
+    module Markdown
+      class << self
+        def registered(app)
+          require "rdiscount"
+        end
+        alias :included :registered
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/middleman/server.rb b/lib/middleman/server.rb
index c64b3cb9..90016abf 100644
--- a/lib/middleman/server.rb
+++ b/lib/middleman/server.rb
@@ -78,6 +78,8 @@ module Middleman
     register Middleman::Renderers::Slim
     register Middleman::Renderers::Haml
     register Middleman::Renderers::Sass
+    register Middleman::Renderers::Markdown
+    register Middleman::Renderers::CoffeeScript
     
     # Rack helper for adding mime-types during local preview
     def self.mime(ext, type)