diff --git a/features/coffee-script.feature b/features/coffee-script.feature
index ec9ee85f..4ed8dba0 100644
--- a/features/coffee-script.feature
+++ b/features/coffee-script.feature
@@ -1,7 +1,12 @@
 Feature: Support coffee-script
   In order to offer an alternative when writing Javascript
-  
+
   Scenario: Rendering coffee script
     Given the Server is running
     When I go to "/javascripts/coffee_test.js"
+    Then I should see "Array.prototype.slice"
+
+  Scenario: Rendering coffee-script with :coffeescript haml-filter
+    Given the Server is running
+    When I go to "/inline-coffeescript.html"
     Then I should see "Array.prototype.slice"
\ No newline at end of file
diff --git a/fixtures/test-app/config.rb b/fixtures/test-app/config.rb
index 1ccf22a6..ea851387 100644
--- a/fixtures/test-app/config.rb
+++ b/fixtures/test-app/config.rb
@@ -1,6 +1,7 @@
 with_layout false do
   page "/inline-css.html"
   page "/inline-js.html"
+  page "/inline-coffeescript.html"
 end
 
 get "/page-class.html" do
diff --git a/fixtures/test-app/views/inline-coffeescript.html.haml b/fixtures/test-app/views/inline-coffeescript.html.haml
new file mode 100644
index 00000000..5204064c
--- /dev/null
+++ b/fixtures/test-app/views/inline-coffeescript.html.haml
@@ -0,0 +1,3 @@
+:coffeescript
+  race = (winner, runners...) ->
+    print winner, runners
\ No newline at end of file
diff --git a/lib/middleman/renderers/haml.rb b/lib/middleman/renderers/haml.rb
index 107404d3..4a3c782b 100755
--- a/lib/middleman/renderers/haml.rb
+++ b/lib/middleman/renderers/haml.rb
@@ -1,4 +1,5 @@
 require "haml"
+require "coffee-filter"
 
 module Middleman
   module Renderers
diff --git a/middleman.gemspec b/middleman.gemspec
index 42f45b44..29ce9cf1 100644
--- a/middleman.gemspec
+++ b/middleman.gemspec
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
   s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
+  s.add_runtime_dependency("coffee-filter", ["~> 0.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.1"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])