diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py
index 7da6b9e4f2..4732e7363f 100644
--- a/django/contrib/gis/admin/options.py
+++ b/django/contrib/gis/admin/options.py
@@ -121,7 +121,6 @@ if gdal.HAS_GDAL:
 
     class OSMGeoAdmin(GeoModelAdmin):
         map_template = 'gis/admin/osm.html'
-        extra_js = ['http://www.openstreetmap.org/openlayers/OpenStreetMap.js']
         num_zoom = 20
         map_srid = spherical_mercator_srid
         max_extent = '-20037508,-20037508,20037508,20037508'
diff --git a/django/contrib/gis/templates/gis/admin/osm.js b/django/contrib/gis/templates/gis/admin/osm.js
index 2a1f59e4d3..16a5773074 100644
--- a/django/contrib/gis/templates/gis/admin/osm.js
+++ b/django/contrib/gis/templates/gis/admin/osm.js
@@ -1,2 +1,2 @@
 {% extends "gis/admin/openlayers.js" %}
-{% block base_layer %}new OpenLayers.Layer.OSM.Mapnik("OpenStreetMap (Mapnik)");{% endblock %}
+{% block base_layer %}new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");{% endblock %}