diff --git a/CHANGELOG b/CHANGELOG
index ba736a1e..28864826 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,12 @@
-* 1.0.6 *
+* 1.1.0 *
 
+* Use rake-compiler-dock v0.6.0
 * Handle SYBVARIANT types from SQL function. Fixes #317. Fixed #321.
 * Fix `use_utf16` optoin for booleans. Fixes #314
 * Add `-q` check for bin puts. Fixes #318
 * Use FreeTDS 1.00.21.
 * Appveyor tests only 2012, 2014 with one Ruby, 23-x64.
-* CircleCI tests 2016.
+* CircleCI & TravisCI both test 2016.
 
 
 * 1.0.5 *
diff --git a/Gemfile b/Gemfile
index 4febb712..9ec53ce4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  gem 'rake-compiler-dock', github: 'rake-compiler/rake-compiler-dock'
   gem 'byebug'
 end
diff --git a/Rakefile b/Rakefile
index 10e15490..880502e5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -89,7 +89,7 @@ desc 'Build the windows binary gems per rake-compiler-dock'
 task 'gem:windows' do
   require 'rake_compiler_dock'
   RakeCompilerDock.sh <<-EOT
-    bundle && rake cross native gem RUBY_CC_VERSION=2.0.0:2.1.6:2.2.2:2.3.0 CFLAGS="-Wall"
+    bundle && rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 CFLAGS="-Wall"
   EOT
 end
 
diff --git a/VERSION b/VERSION
index af0b7ddb..9084fa2f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.6
+1.1.0
diff --git a/ext/tiny_tds/extconf.rb b/ext/tiny_tds/extconf.rb
index 4a999e6f..40282c61 100644
--- a/ext/tiny_tds/extconf.rb
+++ b/ext/tiny_tds/extconf.rb
@@ -205,7 +205,9 @@ def install
 def define_libiconv_recipe(host)
   BuildRecipe.new("libiconv", ICONV_VERSION, [ICONV_SOURCE_URI]).tap do |recipe|
     # always produce position independent code
-    recipe.configure_options << "CFLAGS=-fPIC"
+    # and set an explicit optimization to avoid inline functions being optimized
+    # out of libiconv
+    recipe.configure_options << "CFLAGS=-fPIC -O2"
   end
 end
 
diff --git a/tiny_tds.gemspec b/tiny_tds.gemspec
index e71af05c..bef88954 100644
--- a/tiny_tds.gemspec
+++ b/tiny_tds.gemspec
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.extensions    = ['ext/tiny_tds/extconf.rb']
   s.license       = 'MIT'
   s.required_ruby_version = '>= 2.0.0'
-  s.add_runtime_dependency     'mini_portile2', '~> 2.0' # Keep this version in sync with the one in extconf.rb !
+  s.add_runtime_dependency     'mini_portile2', '~> 2.0'
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rake-compiler', '0.9.5'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1'
+  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.0'
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'connection_pool', '~> 2.2'
 end