diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 6bba3edf3..e151a2dc3 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -18,7 +18,7 @@ $(document).ready(function () {
     var browseObjectList;
     var areasHidden = false;
 
-    var dataLayer = new L.OSM(null, {
+    var dataLayer = new L.OSM.DataLayer(null, {
       styles: {
         way: {
           weight: 3,
@@ -38,7 +38,7 @@ $(document).ready(function () {
     dataLayer.addTo(map);
 
     dataLayer.isWayArea = function () {
-      return !areasHidden && L.OSM.prototype.isWayArea.apply(this, arguments);
+      return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
     };
 
     var drawHandler = new L.Rectangle.Draw(map, {title: I18n.t('browse.start_rjs.drag_a_box')});
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 2e72046d1..e163ef265 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -131,7 +131,7 @@ function addObjectToMap(object, zoom, callback) {
     url: OSM.apiUrl(object),
     dataType: "xml",
     success: function (xml) {
-      var layer = new L.OSM(xml, {
+      var layer = new L.OSM.DataLayer(xml, {
         style: {
           strokeColor: "blue",
           strokeWidth: 3,
diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index 66879d1dd..55b27e7cf 100644
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -1,4 +1,44 @@
-L.OSM = L.FeatureGroup.extend({
+L.OSM = {};
+
+L.OSM.TileLayer = L.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+    attribution: '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'
+  },
+
+  initialize: function (options) {
+    options = L.Util.setOptions(this, options);
+    L.TileLayer.prototype.initialize.call(this, options.url);
+  }
+});
+
+L.OSM.Mapnik = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+  }
+});
+
+L.OSM.CycleMap = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
+  }
+});
+
+L.OSM.TransportMap = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png'
+  }
+});
+
+L.OSM.MapQuestOpen = L.OSM.TileLayer.extend({
+  options: {
+    url: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
+    subdomains: '1234',
+    attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>"
+  }
+});
+
+L.OSM.DataLayer = L.FeatureGroup.extend({
   options: {
     areaTags: ['area', 'building', 'leisure', 'tourism', 'ruins', 'historic', 'landuse', 'military', 'natural', 'sport'],
     uninterestingTags: ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],