diff --git a/templates/admin/change_list.html b/templates/admin/change_list.html
index 4bd1ab50..a6210b90 100644
--- a/templates/admin/change_list.html
+++ b/templates/admin/change_list.html
@@ -74,6 +74,7 @@
       {% endblock %}
 
       <form id="changelist-form" method="post"{% if cl.formset.is_multipart %} enctype="multipart/form-data"{% endif %} novalidate>{% csrf_token %}
+      {% block pagination_up %}{% pagination cl %}{% endblock %}
       {% if cl.formset %}
         <div>{{ cl.formset.management_form }}</div>
       {% endif %}
diff --git a/templates/admin/pagination.html b/templates/admin/pagination.html
index d6e4922d..2add76e5 100644
--- a/templates/admin/pagination.html
+++ b/templates/admin/pagination.html
@@ -1,13 +1,11 @@
 {# Please keep this template in sync with django/contrib/admin one #}
 {% load admin_list %}
 {% load i18n %}
-<ul class="paginator pagination">
 {% if pagination_required %}
+<ul class="paginator pagination">
 {% for i in page_range %}
-    {% paginator_number cl i %}
+<li {% if cl.page_num == i %}class="active"{% endif %}>{% paginator_number cl i %}</li>
 {% endfor %}
-{% endif %}
-<li>{{ cl.result_count }} {% if cl.result_count == 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endif %}</li>
-{% if show_all_url %}<li><a href="{{ show_all_url }}" class="showall">{% trans 'Show all' %}</a></li>{% endif %}
-{% if cl.formset and cl.result_count %}<li><input type="submit" name="_save" class="default" value="{% trans 'Save' %}"/></li>{% endif %}
 </ul>
+{% endif %}
+{% if cl.formset and cl.result_count %}<p><input type="submit" name="_save" class="default" value="{% trans 'Save' %}"/></p>{% endif %}