diff --git a/pywb/cdx/cdxobject.py b/pywb/cdx/cdxobject.py
index e9174a37..021ea71a 100644
--- a/pywb/cdx/cdxobject.py
+++ b/pywb/cdx/cdxobject.py
@@ -127,7 +127,7 @@ class CDXObject(OrderedDict):
                     try:
                         v.encode('ascii')
                     except UnicodeEncodeError:
-                        v = quote(v, safe=':/')
+                        v = quote(v.encode('utf-8'), safe=':/')
 
                 self[n] = v
 
diff --git a/setup.py b/setup.py
index 08aecc1e..6dba8420 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ setup(
     long_description=long_description,
     license='GPL',
     packages=find_packages(),
-    zip_safe=False,
+    zip_safe=True,
     provides=[
         'pywb',
         'pywb.utils',