diff --git a/Gemfile b/Gemfile
index 19f037bb3..9e0f197a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem "bootstrap-sass",         "3.3.7"
 gem "bootstrap-switch-rails", "3.3.3"
 gem "compass-rails",          "3.0.2"
 gem "sass-rails",             "5.0.6"
-gem "sprockets",              "2.12.4"
+gem "sprockets-rails",        "3.2.0"
 
 # Database
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 50486ca8d..f0adbbfb3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -287,7 +287,6 @@ GEM
       tilt (>= 1.2)
     hashdiff (0.3.4)
     hashie (3.5.6)
-    hike (1.2.3)
     hitimes (1.2.5)
     http (2.2.2)
       addressable (~> 2.3)
@@ -657,15 +656,13 @@ GEM
       spring (>= 0.9.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     state_machines (0.5.0)
     string-direction (1.2.0)
       yard (~> 0.8)
@@ -686,7 +683,7 @@ GEM
       activerecord (>= 3.2)
     thor (0.19.1)
     thread_safe (0.3.6)
-    tilt (1.4.1)
+    tilt (2.0.8)
     timecop (0.9.1)
     timers (4.1.2)
       hitimes
@@ -879,7 +876,7 @@ DEPENDENCIES
   spring (= 2.0.2)
   spring-commands-cucumber (= 1.0.1)
   spring-commands-rspec (= 1.0.4)
-  sprockets (= 2.12.4)
+  sprockets-rails (= 3.2.0)
   string-direction (= 1.2.0)
   test_after_commit (= 1.1.0)
   thor (= 0.19.1)