diff --git a/lib/sass/rails/version.rb b/lib/sass/rails/version.rb
index 1ca222a..3774380 100644
--- a/lib/sass/rails/version.rb
+++ b/lib/sass/rails/version.rb
@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "5.0.4"
+    VERSION = "5.0.5"
   end
 end
diff --git a/test/fixtures/alternate_config_project/config/environments/production.rb b/test/fixtures/alternate_config_project/config/environments/production.rb
index 71f2cff..1f0d946 100644
--- a/test/fixtures/alternate_config_project/config/environments/production.rb
+++ b/test/fixtures/alternate_config_project/config/environments/production.rb
@@ -11,8 +11,8 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = false
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = false
   else
     config.serve_static_assets = false
   end
diff --git a/test/fixtures/alternate_config_project/config/environments/test.rb b/test/fixtures/alternate_config_project/config/environments/test.rb
index 055730d..ecbcb86 100644
--- a/test/fixtures/alternate_config_project/config/environments/test.rb
+++ b/test/fixtures/alternate_config_project/config/environments/test.rb
@@ -8,12 +8,12 @@
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = true
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = true
   else
     config.serve_static_assets = true
   end
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   config.eager_load = false
 
diff --git a/test/fixtures/engine_project/engine_project.gemspec b/test/fixtures/engine_project/engine_project.gemspec
index 3098f51..2e9a82f 100644
--- a/test/fixtures/engine_project/engine_project.gemspec
+++ b/test/fixtures/engine_project/engine_project.gemspec
@@ -7,16 +7,16 @@ require "engine_project/version"
 Gem::Specification.new do |s|
   s.name        = "engine_project"
   s.version     = EngineProject::VERSION
-  s.authors     = ["TODO: Your name"]
-  s.email       = ["TODO: Your email"]
-  s.homepage    = "TODO"
-  s.summary     = "TODO: Summary of EngineProject."
-  s.description = "TODO: Description of EngineProject."
+  s.authors     = ["Your name"]
+  s.email       = ["Your email"]
+  s.homepage    = "http://example.com"
+  s.summary     = "Summary of EngineProject."
+  s.description = "Description of EngineProject."
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", ">= 4.0.0.beta", "< 5.0"
+  s.add_dependency "rails", ">= 4.0.0.beta", "< 6"
   # s.add_dependency "jquery-rails"
 
   s.add_development_dependency "sqlite3"
diff --git a/test/fixtures/engine_project/test/dummy/config/environments/production.rb b/test/fixtures/engine_project/test/dummy/config/environments/production.rb
index 515dcda..e70e2e3 100644
--- a/test/fixtures/engine_project/test/dummy/config/environments/production.rb
+++ b/test/fixtures/engine_project/test/dummy/config/environments/production.rb
@@ -20,8 +20,8 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = false
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = false
   else
     config.serve_static_assets = false
   end
diff --git a/test/fixtures/engine_project/test/dummy/config/environments/test.rb b/test/fixtures/engine_project/test/dummy/config/environments/test.rb
index 97c5c2b..72f2652 100644
--- a/test/fixtures/engine_project/test/dummy/config/environments/test.rb
+++ b/test/fixtures/engine_project/test/dummy/config/environments/test.rb
@@ -13,12 +13,12 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = true
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = false
   else
     config.serve_static_assets = true
   end
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
diff --git a/test/fixtures/sass_project/config/environments/production.rb b/test/fixtures/sass_project/config/environments/production.rb
index 9f2f678..c671f74 100644
--- a/test/fixtures/sass_project/config/environments/production.rb
+++ b/test/fixtures/sass_project/config/environments/production.rb
@@ -12,8 +12,8 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = false
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = false
   else
     config.serve_static_assets = false
   end
diff --git a/test/fixtures/sass_project/config/environments/test.rb b/test/fixtures/sass_project/config/environments/test.rb
index e1219be..4c5a552 100644
--- a/test/fixtures/sass_project/config/environments/test.rb
+++ b/test/fixtures/sass_project/config/environments/test.rb
@@ -11,12 +11,12 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = true
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = false
   else
     config.serve_static_assets = true
   end
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
diff --git a/test/fixtures/scss_project/config/environments/production.rb b/test/fixtures/scss_project/config/environments/production.rb
index 9825b59..c2c2b28 100644
--- a/test/fixtures/scss_project/config/environments/production.rb
+++ b/test/fixtures/scss_project/config/environments/production.rb
@@ -11,8 +11,8 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = false
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = false
   else
     config.serve_static_assets = false
   end
diff --git a/test/fixtures/scss_project/config/environments/test.rb b/test/fixtures/scss_project/config/environments/test.rb
index d1544b4..c6f1853 100644
--- a/test/fixtures/scss_project/config/environments/test.rb
+++ b/test/fixtures/scss_project/config/environments/test.rb
@@ -10,12 +10,12 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  if config.respond_to?(:serve_static_files)
-    config.serve_static_files = true
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = true
   else
     config.serve_static_assets = true
   end
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true