diff --git a/setup.py b/setup.py
index 2c37c65b6c8..5fe03f9eb58 100644
--- a/setup.py
+++ b/setup.py
@@ -127,7 +127,10 @@
         "django-bootstrap3-datetimepicker>=2.2.3",
 
         # AWS S3 dependencies
-        "django-storages>=1.1.8"
+        "django-storages>=1.1.8",
+
+        # https://github.com/benjaminp/six/issues/210
+        "six==1.10.0"
         ],
       zip_safe=False,
       )