diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py
index df93c543d2..098d3e0686 100644
--- a/django/contrib/sites/models.py
+++ b/django/contrib/sites/models.py
@@ -10,14 +10,24 @@ class Site(models.Model):
     domain = models.CharField(_('domain name'), maxlength=100)
     name = models.CharField(_('display name'), maxlength=50)
     objects = SiteManager()
+
     class Meta:
         db_table = 'django_site'
         verbose_name = _('site')
         verbose_name_plural = _('sites')
         ordering = ('domain',)
-    class Admin:
-        list_display = ('domain', 'name')
-        search_fields = ('domain', 'name')
 
     def __str__(self):
         return self.domain
+
+# Register the admin options for these models.
+# TODO: Maybe this should live in a separate module admin.py, but how would we
+# ensure that module was loaded?
+
+from django.contrib import admin
+
+class SiteAdmin(admin.ModelAdmin):
+    list_display = ('domain', 'name')
+    search_fields = ('domain', 'name')
+
+admin.site.register(Site, SiteAdmin)