diff --git a/Gemfile b/Gemfile
index 2672939ca..3f23504b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ group :development do
   gem 'brightbox', '>=2.3.9'
   gem 'rack-cors', :require => 'rack/cors'
   gem 'quiet_assets', '~> 1.1.0'
-  gem 'webrick', '1.3.1'
+  gem 'webrick', '1.6.1'
   gem 'jslint_on_rails'
   gem 'git_pretty_accept'
   gem 'rubocop', '~> 0.40.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index a0fef66ec..2190b6cd6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -493,7 +493,7 @@ GEM
     uuidtools (2.1.4)
     warden (1.2.7)
       rack (>= 1.0)
-    webrick (1.3.1)
+    webrick (1.6.1)
     whenever (0.9.4)
       chronic (>= 0.6.3)
     wicked (1.3.3)
@@ -613,7 +613,7 @@ DEPENDENCIES
   traco (~> 2.0.0)
   uglifier (>= 1.0.3)
   underscore-rails
-  webrick (= 1.3.1)
+  webrick (= 1.6.1)
   whenever
   wicked (~> 1.3.3)
   wkhtmltopdf-binary (~> 0.9.9)