diff --git a/CHANGES b/CHANGES
index 52e1719e..bce6da70 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,26 @@
+= 0.9.0.4 / 2009-01-25
+
+ * Using halt with more than 1 args causes ArgumentError [#131]
+ * using halt in a before filter doesn't modify response [#127]
+ * Add deprecated Sinatra::EventContext to unbreak plugins [#130]
+ * Give access to GET/POST params in filters [#129]
+ * Preserve non-nested params in nested params hash [#117]
+ * Fix backtrace dump with Rack::Lint [#116]
+
+= 0.9.0.3 / 2009-01-21
+
+ * Fall back on mongrel then webrick when thin not found. [#75]
+ * Use :environment instead of :env in test helpers to
+   fix deprecation warnings coming from framework.
+ * Make sinatra/test/rspec work again [#113]
+ * Fix app_file detection on windows [#118]
+ * Fix static files with Rack::Lint in pipeline [#121]
+
+= 0.9.0.2 / 2009-01-18
+
+ * Halting a before block should stop processing of routes [#85]
+ * Fix redirect/halt in before filters [#85]
+
 = 0.9.0 / 2009-01-18
 
  * Works with and requires Rack >= 0.9.1
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index abb1c664..6df4a9ae 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.9.0.2'
+  VERSION = '0.9.0.4'
 
   class Request < Rack::Request
     def user_agent
diff --git a/sinatra.gemspec b/sinatra.gemspec
index 4414b1b1..985ad312 100644
--- a/sinatra.gemspec
+++ b/sinatra.gemspec
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     compat/app_test.rb
     compat/application_test.rb
     compat/builder_test.rb
+    compat/compat_test.rb
     compat/custom_error_test.rb
     compat/erb_test.rb
     compat/events_test.rb
@@ -78,12 +79,15 @@ Gem::Specification.new do |s|
     test/options_test.rb
     test/reload_test.rb
     test/request_test.rb
+    test/response_test.rb
     test/result_test.rb
     test/routing_test.rb
     test/sass_test.rb
+    test/server_test.rb
     test/sinatra_test.rb
     test/static_test.rb
     test/templates_test.rb
+    test/test_test.rb
     test/views/hello.builder
     test/views/hello.erb
     test/views/hello.haml