diff --git a/CHANGELOG b/CHANGELOG
index 2c16483..368e40e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+== LATEST
+
+ * Automatically add Rack::Chunked to middleware stack.
+
 == 0.0.4 2010-04-26
 
  * Add when_streaming_template callback. Called after an action that
diff --git a/lib/template_streaming.rb b/lib/template_streaming.rb
index 7ce7dfe..d03bda0 100644
--- a/lib/template_streaming.rb
+++ b/lib/template_streaming.rb
@@ -251,4 +251,5 @@ def padding
   ActionView::Base.send :include, View
   ActionController::Base.send :include, Controller
   ActionController::Response.send :include, Response
+  ActionController::Dispatcher.middleware.use Rack::Chunked
 end