diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3f02bf2..d09bafa8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the LaunchDarkly Ruby SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [2.1.1] - 2017-03-28
+## Changed
+- Bumped nio4r to 2.0
+
 ## [2.0.6] - 2017-02-10
 ## Changed
 - Improved handling of http status codes that may not be integers.
diff --git a/circle.yml b/circle.yml
index b9b92b98..cc2e0b85 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   environment:
-    RUBIES: "ruby-2.2.3;ruby-2.1.7;ruby-2.0.0;ruby-1.9.3;jruby-1.7.22"
+    RUBIES: "ruby-2.4.1;ruby-2.2.3;ruby-2.1.7;ruby-2.0.0;ruby-1.9.3;jruby-1.7.22" 
 
 dependencies:
   cache_directories:
diff --git a/ldclient-rb.gemspec b/ldclient-rb.gemspec
index 65f70532..00da26f9 100644
--- a/ldclient-rb.gemspec
+++ b/ldclient-rb.gemspec
@@ -33,7 +33,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "hashdiff", "~> 0.2"
   spec.add_runtime_dependency "ld-celluloid-eventsource", "~> 0.9.0"
   spec.add_runtime_dependency "celluloid", "~> 0.18.0.pre" # transitive dep; specified here for more control
-  spec.add_runtime_dependency "nio4r", "~> 1.1" # for maximum ruby version compatibility.
+  
+  if RUBY_VERSION >= '2.2.2'
+    spec.add_runtime_dependency "nio4r", "< 3" # for maximum ruby version compatibility.
+  else
+    spec.add_runtime_dependency "nio4r", "~> 1.1" # for maximum ruby version compatibility.
+  end
 
   spec.add_runtime_dependency "waitutil", "0.2"
 end
diff --git a/lib/ldclient-rb/version.rb b/lib/ldclient-rb/version.rb
index cc6064e3..b8ba2b7c 100644
--- a/lib/ldclient-rb/version.rb
+++ b/lib/ldclient-rb/version.rb
@@ -1,3 +1,3 @@
 module LaunchDarkly
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end