diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7d492189..9cde76382 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Current
 
+## Release v1.1.8 (20 January 2021)
+
+* (#885) Fix race condition in TVar for stale reads 
+* (#884) RubyThreadLocalVar: Do not iterate over hash which might conflict with new pair addition
+
 ## Release v1.1.7 (6 August 2020)
 
 concurrent-ruby:
diff --git a/Rakefile b/Rakefile
index 2ce9ab668..7c0b4af9a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -49,7 +49,9 @@ namespace :repackage do
       Rake::Task['lib/concurrent-ruby/concurrent/concurrent_ruby.jar'].invoke
 
       # build all gem files
-      RakeCompilerDock.sh 'bundle install --local && bundle exec rake cross native package --trace'
+      %w[x86-mingw32 x64-mingw32].each do |plat|
+        RakeCompilerDock.sh "bundle install --local && bundle exec rake native:#{plat} gem --trace", platform: plat
+      end
     end
   end
 end
@@ -302,7 +304,7 @@ namespace :release do
     end
 
     desc '** tag HEAD with current version and push to github'
-    task :tag do
+    task :tag => :ask do
       Dir.chdir(__dir__) do
         sh "git tag v#{Concurrent::VERSION}"
         sh "git push origin v#{Concurrent::VERSION}"
@@ -312,7 +314,7 @@ namespace :release do
     end
 
     desc '** push all *.gem files to rubygems'
-    task :rubygems do
+    task :rubygems => :ask do
       Dir.chdir(__dir__) do
         sh "gem push pkg/concurrent-ruby-#{Concurrent::VERSION}.gem"
         sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem" if publish_edge
diff --git a/lib/concurrent-ruby/concurrent/version.rb b/lib/concurrent-ruby/concurrent/version.rb
index d18c0389d..8d9dde235 100644
--- a/lib/concurrent-ruby/concurrent/version.rb
+++ b/lib/concurrent-ruby/concurrent/version.rb
@@ -1,3 +1,3 @@
 module Concurrent
-  VERSION      = '1.1.7'
+  VERSION      = '1.1.8'
 end