diff --git a/Gemfile b/Gemfile
index 141836c1..863e8082 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,12 +21,12 @@ gem "less", "~> 2.2", :require => false
 gem "stylus", :require => false
 
 platforms :ruby do
-  gem "therubyracer", "0.10.2"
+  gem "therubyracer"#, "0.10.2"
   gem "redcarpet"
 end
 
 platforms :jruby do
-  gem "therubyrhino", "1.73.5"
+  gem "therubyrhino"
 end
 
 # Middleman itself
diff --git a/middleman-core/lib/middleman-core/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
index 8727bf19..9cf1baff 100644
--- a/middleman-core/lib/middleman-core/core_extensions/rendering.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
@@ -22,6 +22,8 @@ module Middleman
           app.define_hook :before_render
           app.define_hook :after_render
 
+          ::Tilt.mappings.delete('html') # WTF, Tilt?
+
           # Activate custom renderers
           require "middleman-core/renderers/erb"
           app.register Middleman::Renderers::ERb
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 9915ef22..e0f3f7b7 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
   s.add_dependency("rack", ["~> 1.4.1"])
-  s.add_dependency("tilt", ["~> 1.3.1"])
+  s.add_dependency("tilt", ["~> 1.3.6"])
   
   # Builder
   s.add_dependency("rack-test", ["~> 0.6.1"])