diff --git a/config/application.rb b/config/application.rb
index f8cc2ba..8dcb35f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -75,13 +75,7 @@ module Noosfero
     # parameters by using an attr_accessible or attr_protected declaration.
     config.active_record.whitelist_attributes = true
 
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # don't let rails prepend app/assets to config.assets.paths
-    # as we are doing it
-    config.paths['app/assets'] = ''
-
+    # Asset pipeline
     config.assets.paths =
       Dir.glob("app/assets/plugins/*/{,stylesheets,javascripts}") +
       Dir.glob("app/assets/{,stylesheets,javascripts}") +
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 92a47b2..93eef48 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -11,8 +11,8 @@ Noosfero::Application.configure do
   # Enable Rails's static asset server (Apache or nginx should do this)
   config.serve_static_assets = true
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts (sass-rails enable compression of CSS by default)
+  config.assets.js_compressor = :uglifier
 
   # Generate digests for assets URLs
   config.assets.digest = true
--
libgit2 0.21.2