diff --git a/Gemfile b/Gemfile
index 187bf6db35..7cf8cd07ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,16 +2,16 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.2.3'
 
-# Bundle edge Rails instead:
-# gem 'rails',     :git => 'git://github.com/rails/rails.git'
-
 gem 'pg'
 gem 'spree'
 gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git'
 
 gem 'spree_usa_epay'
 gem 'spree_skrill'
-gem 'simple_form'
+
+# Fix bug in simple_form preventing collection_check_boxes usage within form_for block
+# When merged, revert to upstream gem
+gem 'simple_form', :git => 'git://github.com/RohanM/simple_form.git'
 
 gem 'unicorn'
 gem 'spree_heroku', :git => 'git://github.com/joneslee85/spree-heroku.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4f7541c376..1aa9bb4a74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/RohanM/simple_form.git
+  revision: 45f08a213b40f3d4bda5f5398db841137587160a
+  specs:
+    simple_form (2.0.2)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+
 GIT
   remote: git://github.com/joneslee85/spree-heroku.git
   revision: 63f0cfa47089cae50365e226ec7dd1eccde0ac05
@@ -120,7 +128,7 @@ GEM
     httpi (1.0.0)
       rack
     i18n (0.6.0)
-    journey (1.0.3)
+    journey (1.0.4)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
@@ -231,9 +239,6 @@ GEM
       rubyzip
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
-    simple_form (2.0.2)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
     slop (2.4.4)
     spork (1.0.0rc3)
     spree (1.1.1)
@@ -332,7 +337,7 @@ DEPENDENCIES
   rspec-rails
   sass-rails (~> 3.2.3)
   shoulda-matchers
-  simple_form
+  simple_form!
   spork (~> 1.0rc)
   spree
   spree_heroku!