diff --git a/setup.py b/setup.py
index 58c50940701..def9ad13606 100644
--- a/setup.py
+++ b/setup.py
@@ -13,11 +13,11 @@ setup(
     license = 'BSD',
     packages = find_packages(),
     package_data = {
-        'django.conf': ['admin_templates/*.html', 'admin_templates/doc/*.html',
-                        'admin_templates/registration/*.html',
-                        'admin_media/css/*.css', 'admin_media/img/admin/*.gif',
-                        'admin_media/img/admin/*.png', 'admin_media/js/*.js',
-                        'admin_media/js/admin/*js'],
+        'django.contrib.admin': ['templates/admin/*.html', 'templates/admin_doc/*.html',
+                        'templates/registration/*.html',
+                        'media/css/*.css', 'media/img/admin/*.gif',
+                        'media/img/admin/*.png', 'media/js/*.js',
+                        'media/js/admin/*js'],
     },
     scripts = ['django/bin/django-admin.py'],
     zip_safe = False,