diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index dca8c1eef0a72..952d4b82985de 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -522,7 +522,7 @@ def add_view(self, request, form_url=''):
             'adminform': adminForm,
             'is_popup': request.REQUEST.has_key('_popup'),
             'show_delete': False,
-            'media': media,
+            'media': mark_safe(media),
             'inline_admin_formsets': inline_admin_formsets,
         })
         return self.render_change_form(model, c, add=True)
@@ -597,7 +597,7 @@ def change_view(self, request, object_id):
             'object_id': object_id,
             'original': obj,
             'is_popup': request.REQUEST.has_key('_popup'),
-            'media': media,
+            'media': mark_safe(media),
             'inline_admin_formsets': inline_admin_formsets,
         })
         return self.render_change_form(model, c, change=True)