diff --git a/zproject/local_settings.py b/zproject/local_settings.py
index 6de5b26b32..8daf294968 100644
--- a/zproject/local_settings.py
+++ b/zproject/local_settings.py
@@ -59,7 +59,9 @@ else:
     EXTERNAL_API_PATH = 'api.zulip.com'
     STATSD_PREFIX = 'app'
 
+# Legacy zulip.com bucket used for old-style S3 uploads.
 S3_BUCKET="humbug-user-uploads"
+# Buckets used for Amazon S3 integration for storing files and user avatars.
 S3_AUTH_UPLOADS_BUCKET = "zulip-user-uploads"
 S3_AVATAR_BUCKET="humbug-user-avatars"
 
diff --git a/zproject/local_settings_template.py b/zproject/local_settings_template.py
index 2173a7870e..308e49ccd8 100644
--- a/zproject/local_settings_template.py
+++ b/zproject/local_settings_template.py
@@ -101,10 +101,12 @@ ERROR_REPORTING = True
 INLINE_IMAGE_PREVIEW = True
 
 # By default, files uploaded by users and user avatars are stored
-# directly on the Zulip server.  If file storage in Amazon S3 (or
-# elsewhere, e.g. your corporate fileshare) is desired, please contact
-# Zulip Support (zulip-devel@googlegroups.com) for further instructions on
-# setting up the appropriate integration.
+# directly on the Zulip server.  If file storage in Amazon S3 is
+# desired, you can configure that by setting s3_key and s3_secret_key
+# in /etc/zulip/zulip-secrets.conf to be the S3 access and secret keys
+# that you want to use, and setting the S3_AUTH_UPLOADS_BUCKET and
+# S3_AVATAR_BUCKET to be the S3 buckets you've created to store file
+# uploads and user avatars, respectively.
 LOCAL_UPLOADS_DIR = "/home/zulip/uploads"
 
 # Controls whether name changes are completely disabled for this installation