diff --git a/config/defaults.yml b/config/defaults.yml
index 29d4ebdab..1105941ff 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -25,6 +25,8 @@ defaults:
       bucket:
       region:
       cache: true
+      host: "s3.amazonaws.com"
+      endpoint: "https://s3.amazonaws.com"
     image_redirect_url:
     assets:
       serve: false
diff --git a/config/diaspora.toml.example b/config/diaspora.toml.example
index 6401fc043..fe9d46710 100644
--- a/config/diaspora.toml.example
+++ b/config/diaspora.toml.example
@@ -113,6 +113,8 @@
 #secret = "change_me"
 #bucket = "my_photos"
 #region = "us-east-1"
+#host = "s3.amazonaws.com"
+#endpoint = "https://s3.amazonaws.com"
 
 ## Use max-age header on Amazon S3 resources (default=true).
 ## When true, this allows locally cached images to be served for up to
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 4a212ad11..4d389d4ed 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -16,13 +16,18 @@ CarrierWave.configure do |config|
         provider:              'AWS',
         aws_access_key_id:     AppConfig.environment.s3.key.get,
         aws_secret_access_key: AppConfig.environment.s3.secret.get,
-        region:                AppConfig.environment.s3.region.get
+        region:                AppConfig.environment.s3.region.get,
+        host:                  AppConfig.environment.s3.host.get,
+        endpoint:              AppConfig.environment.s3.endpoint.get,
+        # XXX: what does this actually do? does it do anything anymore?
+        path_style:            true
     }
     if AppConfig.environment.s3.cache?
       config.fog_attributes['Cache-Control'] = 'max-age=31536000'
     end
 
     config.fog_directory = AppConfig.environment.s3.bucket.get
+    config.asset_host = AppConfig.environment.image_redirect_url.get
   else
     config.storage = :file
   end