diff --git a/Gemfile b/Gemfile
index a0508d3821..7177b48a3e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # until we have 3.2.10 use rails-3-2-stable to avoid mocha bugs
 # see: https://github.com/freerange/mocha/issues/117
 gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-2-stable"
+gem "sprockets", :git => "git@github.com:tessi/sprockets.git", :branch => "2_2_1-backport"
 #gem 'rails', '3.2.10'
 
 gem "coderay", "~> 1.0.5"
@@ -39,7 +40,7 @@ end
 
 gem "prototype-rails"
 gem 'jquery-rails', '~> 2.0.3'
-gem "i18n-js", :git => "git://github.com/tessi/i18n-js.git", :branch => "rewrite"
+gem "i18n-js"
 
 group :test do
   gem 'shoulda', '~> 3.1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index c4868c316d..f35c511597 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -62,12 +62,15 @@ GIT
       paper_trail (~> 2)
 
 GIT
-  remote: git://github.com/tessi/i18n-js.git
-  revision: 54f006382e1130ef57d817ff38536b43f7e6f92f
-  branch: rewrite
+  remote: git@github.com:tessi/sprockets.git
+  revision: f8cf7a6d158f000096a94fb4be74195e8459d0fd
+  branch: 2_2_1-backport
   specs:
-    i18n-js (3.0.0.rc3)
-      i18n
+    sprockets (2.2.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -158,6 +161,8 @@ GEM
     hike (1.2.1)
     htmldiff (0.0.1)
     i18n (0.6.1)
+    i18n-js (2.1.2)
+      i18n
     interception (0.3)
     journey (1.0.4)
     jquery-rails (2.0.3)
@@ -285,11 +290,6 @@ GEM
       spork (>= 1.0rc0)
     spork-testunit (0.0.8)
       spork (>= 0.6.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     sqlite3-ruby (1.2.5)
     structured_warnings (0.1.3)
@@ -343,7 +343,7 @@ DEPENDENCIES
   guard-spork
   guard-test
   htmldiff
-  i18n-js!
+  i18n-js
   jquery-rails (~> 2.0.3)
   jquery-ui-rails
   jruby-openssl
@@ -378,6 +378,7 @@ DEPENDENCIES
   shoulda (~> 3.1.1)
   spork-rails
   spork-testunit
+  sprockets!
   sqlite3
   sqlite3-ruby (< 1.3)
   therubyracer