diff --git a/Gemfile b/Gemfile
index 5ec4b6405..0318635b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -108,10 +108,10 @@ gem 'client_side_validations'
 # assets
 
 group :assets do
-  gem 'sass-rails'
+  gem 'sass-rails', '3.1.4'
+  gem 'handlebars_assets'
   gem 'uglifier'
 end
-gem 'handlebars_assets'
 
 gem 'jquery-rails'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 55da05532..42609f656 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -413,10 +413,11 @@ GEM
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.6.1)
     sass (3.1.15)
-    sass-rails (3.1.6)
+    sass-rails (3.1.4)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
-      sass (>= 3.1.10)
+      sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
       tilt (~> 1.3.2)
     selenium-webdriver (2.16.0)
       childprocess (>= 0.2.5)
@@ -558,7 +559,7 @@ DEPENDENCIES
   ruby-debug19
   ruby-oembed (~> 0.8.7)
   sass
-  sass-rails
+  sass-rails (= 3.1.4)
   selenium-webdriver (~> 2.16.0)
   settingslogic!
   sqlite3
diff --git a/config/application.rb b/config/application.rb
index 46afbee01..324fb9d26 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,9 +13,13 @@ if RUBY_VERSION.include? '1.9'
 end
 
 require 'rails/all'
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 
 module Diaspora