diff --git a/MANIFEST.in b/MANIFEST.in
index 9100b772..a73ef711 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,4 @@
 include LICENSE
+include README.md
 include archivebox/VERSION
-graft archivebox/themes
-graft archivebox/themes/static
-graft archivebox/themes/admin
-graft archivebox/themes/default
-graft archivebox/themes/default/static
-graft archivebox/themes/legacy
-graft archivebox/themes/legacy/static
+recursive-include archivebox/themes *
diff --git a/setup.py b/setup.py
index 723aeaa1..f23ae7b5 100644
--- a/setup.py
+++ b/setup.py
@@ -55,19 +55,7 @@ setuptools.setup(
             'archivebox = archivebox.__main__:main',
         ],
     },
-    package_data={
-        'archivebox': [
-            # Manifest.ini must correspond 1:1 with this list
-            'VERSION',
-            'themes/*',
-            'themes/static/*',
-            'themes/admin/*'
-            'themes/default/*'
-            'themes/default/static/*'
-            'themes/legacy/*',
-            'themes/legacy/static/*',
-        ],
-    },
+    include_package_data=True,
     classifiers=[
         "Development Status :: 4 - Beta",