diff --git a/History.md b/History.md
index aa7e139b..960a2b84 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,12 @@
+## 1.1.21 (17/09/17)
+
+- update (bundled) rack to 1.6.8
+- add Rack::Handler::Servlet::DefaultEnv#get_header (#212)
+  missing methods to handle ActionController::Base#reset_session
+- can only safely stream natively on ActionDispatch <= 3.2 (#210) 
+  (broken Rails streaming for Rails 4.x)
+- when handling OPTION calls ignore both 'Date' and 'Allow' headers (#205)
+
 ## 1.1.20 (22/01/16)
 
 - pre-maturely avoid Ruby frozen string literals coming at us ... ''.dup meh!
diff --git a/pom.xml b/pom.xml
index afd2696d..71478e93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.jruby.rack</groupId>
   <artifactId>jruby-rack</artifactId>
-  <version>1.1.21-SNAPSHOT</version>
+  <version>1.1.21</version>
   <name>JRuby-Rack</name>
   <url>http://github.com/jruby/jruby-rack/</url>
   <description>
diff --git a/src/main/ruby/jruby/rack/version.rb b/src/main/ruby/jruby/rack/version.rb
index 246323ef..e6dea266 100644
--- a/src/main/ruby/jruby/rack/version.rb
+++ b/src/main/ruby/jruby/rack/version.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012-2016 Karol Bucek, LTD.
+# Copyright (c) 2012-2017 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
@@ -8,6 +8,6 @@
 
 module JRuby
   module Rack
-    VERSION = '1.1.21.SNAPSHOT'
+    VERSION = '1.1.21'
   end
 end