Index: django/contrib/admin/templates/admin/change_form.html
===================================================================
--- django/contrib/admin/templates/admin/change_form.html	(revision 9844)
+++ django/contrib/admin/templates/admin/change_form.html	(working copy)
@@ -21,7 +21,7 @@
 </div>
 {% endif %}{% endblock %}
 
-{% block content %}<div id="content-main">
+{% block content %}{% block content_top %}<div id="content-main">{% endblock %}
 {% block object-tools %}
 {% if change %}{% if not is_popup %}
   <ul class="object-tools"><li><a href="history/" class="historylink">{% trans "History" %}</a></li>
@@ -29,31 +29,45 @@
   </ul>
 {% endif %}{% endif %}
 {% endblock %}
-<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% block form_top %}{% endblock %}
+
+{% block form_top %}
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">
 <div>
 {% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
-{% if save_on_top %}{% submit_row %}{% endif %}
+{% endblock %}
+
+{% block submit_row_top %}{% if save_on_top %}{% submit_row %}{% endif %}{% endblock %}
+
+{% block errors %}
 {% if errors %}
     <p class="errornote">
     {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
     </p>
     <ul class="errorlist">{% for error in adminform.form.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul>
 {% endif %}
+{% endblock %}
 
+{% block fieldsets %}
 {% for fieldset in adminform %}
   {% include "admin/includes/fieldset.html" %}
 {% endfor %}
+{% endblock %}
 
 {% block after_field_sets %}{% endblock %}
 
+{% block inline_admin_formsets %}
 {% for inline_admin_formset in inline_admin_formsets %}
     {% include inline_admin_formset.opts.template %}
 {% endfor %}
+{% endblock %}
 
 {% block after_related_objects %}{% endblock %}
 
+{% block submit_row_bottom %}
 {% submit_row %}
+{% endblock %}
 
+{% block form_bottom %}
 {% if add %}
    <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
 {% endif %}
@@ -62,5 +76,7 @@
 {% prepopulated_fields_js %}
 
 </div>
-</form></div>
+</form>
 {% endblock %}
+{% block content_bottom %}</div>{% endblock %}
+{% endblock %}