diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5ee2784dd7acde9a0198ea2db5ec055733884736..0dc2c9b999f7648707d9f09ad22a4647cb0a1287 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -29,7 +29,7 @@ Diaspora::Application.configure do
 
   # Disable Rails's static asset server
   # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
+  config.serve_static_assets = true
 
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
diff --git a/config/thin.yml b/config/thin.yml
index c46f482c2750f152a7dc1eac1288a9538aad3e13..f60fed103133c17452279c12131670c994ec094d 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -7,7 +7,7 @@ max_conns: 1024
 require: []
 
 max_persistent_conns: 512
-environment: development
+environment: production
 servers: 1
 daemonize: true
 #chdir: /usr/applications/localhash/current