diff --git a/Gemfile b/Gemfile
index 2407beb44e..6f1db41b35 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem "rdoc"
 gem "rake-compiler"
 gem "test-unit", "~> 3.0"
 
-gem "rack", "< 2.0"
+gem "rack", "< 3.0"
 gem 'minitest', '~> 5.8'
 
 gem "jruby-openssl", :platform => "jruby"
diff --git a/Rakefile b/Rakefile
index 99202b3fe9..a08c8f6c5f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -20,7 +20,7 @@ HOE = Hoe.spec "puma" do
 
   require_ruby_version ">= 1.8.7"
 
-  dependency "rack", [">= 1.1", "< 2.0"], :development
+  dependency "rack", [">= 1.1", "< 3.0"], :development
 
   extra_dev_deps << ["rake-compiler", "~> 0.8"]
 end