diff --git a/CHANGES b/CHANGES
index 081568e1..52e1719e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-= 0.9.0 (unreleased)
+= 0.9.0 / 2009-01-18
 
  * Works with and requires Rack >= 0.9.1
 
@@ -45,6 +45,10 @@
    has the status code specified. It's also possible to register an error
    page for a range of status codes: "error(500..599)".
 
+ * In-file templates are now automatically imported from the file that
+   requires 'sinatra'. The use_in_file_templates! method is still available
+   for loading templates from other files.
+
  * Sinatra's testing support is no longer dependent on Test::Unit. Requiring
    'sinatra/test' adds the Sinatra::Test module and Sinatra::TestHarness
    class, which can be used with any test framework. The 'sinatra/test/unit',
diff --git a/Rakefile b/Rakefile
index 048d68eb..a29fc38c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -57,7 +57,12 @@ file package('.gem') => %w[dist/ sinatra.gemspec] + spec.files do |f|
 end
 
 file package('.tar.gz') => %w[dist/] + spec.files do |f|
-  sh "git archive --format=tar HEAD | gzip > #{f.name}"
+  sh <<-SH
+    git archive \
+      --prefix=sinatra-#{source_version}/ \
+      --format=tar \
+      HEAD | gzip > #{f.name}
+  SH
 end
 
 # Rubyforge Release / Publish Tasks ==================================
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index f47b0f67..cd7a70ab 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.8.10'
+  VERSION = '0.9.0'
 
   class Request < Rack::Request
     def user_agent
diff --git a/sinatra.gemspec b/sinatra.gemspec
index 5df6f8a9..ffaaa49c 100644
--- a/sinatra.gemspec
+++ b/sinatra.gemspec
@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '0.8.10'
-  s.date = '2009-01-16'
+  s.version = '0.9.0'
+  s.date = '2009-01-18'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"