diff --git a/bigbuild/views.py b/bigbuild/views.py
index 144c2c0..2d904e7 100644
--- a/bigbuild/views.py
+++ b/bigbuild/views.py
@@ -157,7 +157,9 @@ def build_static_directory(self, obj):
 
         # An internal django-bakery trick to gzip them if we need to
         if settings.BAKERY_GZIP:
-            Build().copytree_and_gzip(
+            cmd = Build()
+            cmd.set_options()
+            cmd.copytree_and_gzip(
                 source_dir,
                 target_dir
             )
diff --git a/requirements.txt b/requirements.txt
index a8163d1..8c8deba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # Dependencies
 Django==1.11
 python-frontmatter==0.4.2
-django-bakery==0.11.1
+-e git+git://github.com/datadesk/django-bakery.git@fs#egg=django-bakery
 PyYAML==3.11
 validictory==1.0.1
 django-compressor==2.0
diff --git a/setup.py b/setup.py
index cc47bb7..6664746 100644
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@ def run(self):
                 'django.contrib.staticfiles',
                 'compressor',
                 'greeking',
+                'bakery',
                 'bigbuild',
             ),
             TEMPLATES=[