diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 67541dd77d30fc70d221758e475a018444022da3..715d4469c6743a91874e0507ff20af2a0f945880 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -85,6 +85,14 @@ STATICFILES_FINDERS = [
     "compressor.finders.CompressorFinder",
 ]
 
+
+# Amazon S3 setup
+DEFAULT_FILE_STORAGE = os.environ.get("DJANGO_DEFAULT_FILE_STORAGE", 'django.core.files.storage.FileSystemStorage') # noqa
+AWS_ACCESS_KEY_ID = os.environ.get("DJANGO_AWS_ACCESS_KEY_ID", None)
+AWS_SECRET_ACCESS_KEY = os.environ.get("DJANGO_AWS_SECRET_ACCESS_KEY", None)
+AWS_STORAGE_BUCKET_NAME = os.environ.get("DJANGO_AWS_STORAGE_BUCKET_NAME", None)
+
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(&#2i5mq_^%%@ihu_qxxotl_"
 
diff --git a/requirements/base.txt b/requirements/base.txt
index d68731417e0a35a97d06f8cf47efc21ea6232c64..721638f3936aedbd6d5974d10f0a3f8cce03bc9a 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,5 @@
 Django>=1.11,<1.12
+boto3==1.4.6
 pinax-theme-bootstrap==7.3.0
 django-user-accounts==1.3.1
 metron==1.3.7
@@ -8,6 +9,7 @@ dj-database-url==0.4.0
 pinax-pages==0.4.2
 pinax-boxes==2.1.2
 django-ssl-redirect==2.0
+django-storages==1.6.5
 django-libsass==0.7
 django-markdown-deux==1.0.5
 django-sitetree==1.8.0