diff --git a/scrapy/trunk/scrapy/contrib/aws.py b/scrapy/trunk/scrapy/contrib/aws.py
index 0ad99f5bd..22ae23a27 100644
--- a/scrapy/trunk/scrapy/contrib/aws.py
+++ b/scrapy/trunk/scrapy/contrib/aws.py
@@ -81,6 +81,7 @@ class AWSMiddleware(object):
         self.secret_key = settings['AWS_SECRET_ACCESS_KEY']
 
     def process_request(self, request, spider):
-        if spider.domain_name in 's3.amazonaws.com':
+        if spider.domain_name == 's3.amazonaws.com' \
+                or request.url.hostname.endswith('s3.amazonaws.com'):
             request.headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
             sign_request(request, self.access_key, self.secret_key)