diff --git a/pywb/apps/wayback.py b/pywb/apps/wayback.py
index 4ba24d36..acdffffb 100644
--- a/pywb/apps/wayback.py
+++ b/pywb/apps/wayback.py
@@ -1,3 +1,9 @@
+# Use gevent if available
+try:
+    from gevent.monkey import patch_all; patch_all()
+except Exception as e:
+    pass
+
 from pywb.framework.wsgi_wrappers import init_app
 from pywb.webapp.pywb_init import create_wb_router
 
diff --git a/uwsgi.ini b/uwsgi.ini
index b09fd071..20c85400 100644
--- a/uwsgi.ini
+++ b/uwsgi.ini
@@ -12,7 +12,10 @@ venv = $(VIRTUAL_ENV)
 endif =
 
 gevent = 100
-gevent-early-monkey-patch =
+
+#Not available until uwsgi 2.1
+#monkey-patching manually in pywb.apps.wayback
+#gevent-early-monkey-patch =
 
 # specify config file here
 env = PYWB_CONFIG_FILE=config.yaml