diff --git a/config/environments/production.rb b/config/environments/production.rb
index 01f143948..eea460257 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -56,6 +56,8 @@
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
+  config.asset_host               = ENV['ASSET_HOST_URL']
+  config.action_mailer.asset_host = ENV['ASSET_HOST_URL']
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.