diff --git a/CHANGES b/CHANGES
index 96651ad2..1552b7cb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,19 @@
+= 1.1.1 / Not Yet Released
+
+ * Added `slim` rendering method for rendering Slim templates. (Steve Hodgkiss)
+
+ * README has been translated to Russian. (Nickolay Schwarz, Vasily Polovnyov)
+
+ * Nested templates without a `:layout` option can now be used from the layout
+   template without causing an infinite loop. (Konstantin Haase)
+
+ * Path is no longer cached if changed between handlers that do pattern
+   matching. This means you can change `request.path_info` in a pattern matching
+   before filter. (Konstantin Haase)
+
+ * Headers set by cache_control now always set max_age as an Integer, making
+   sure it is compatible with RFC2616. (Konstantin Haase)
+
 = 1.1.0 / 2010-10-24
 
  * Before and after filters now support pattern matching, including the
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index 462a8a80..41259185 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
diff --git a/sinatra.gemspec b/sinatra.gemspec
index c49eb36d..1bbd4f67 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 = '1.1.0'
-  s.date = '2010-10-24'
+  s.version = '1.1.1'
+  s.date = '2010-11-12'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     README.hu.rdoc
     README.jp.rdoc
     README.rdoc
+    README.ru.rdoc
     README.zh.rdoc
     Rakefile
     lib/sinatra.rb
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
     test/server_test.rb
     test/settings_test.rb
     test/sinatra_test.rb
+    test/slim_test.rb
     test/static_test.rb
     test/templates_test.rb
     test/textile_test.rb
@@ -90,6 +92,7 @@ Gem::Specification.new do |s|
     test/views/hello.rdoc
     test/views/hello.sass
     test/views/hello.scss
+    test/views/hello.slim
     test/views/hello.str
     test/views/hello.test
     test/views/hello.textile
@@ -101,6 +104,7 @@ Gem::Specification.new do |s|
     test/views/layout2.mab
     test/views/layout2.nokogiri
     test/views/layout2.radius
+    test/views/layout2.slim
     test/views/layout2.str
     test/views/layout2.test
     test/views/nested.str