diff --git a/dist/recline.js b/dist/recline.js
index 32ff35e9..14d2fbfc 100644
--- a/dist/recline.js
+++ b/dist/recline.js
@@ -2282,16 +2282,16 @@ my.Map = Backbone.View.extend({
 
   // Private: Sets up the Leaflet map control and the features layer.
   //
-  // The map uses a base layer from [MapQuest](http://www.mapquest.com) based
-  // on [OpenStreetMap](http://openstreetmap.org).
+  // The map uses a base layer from [OpenStreetMap.org](http://openstreetmap.org) based
+  // on [OpenStreetMap data](http://openstreetmap.org).
   //
   _setupMap: function(){
     var self = this;
     this.map = new L.Map(this.$map.get(0));
 
-    var mapUrl = "http://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png";
-    var osmAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">';
-    var bg = new L.TileLayer(mapUrl, {maxZoom: 18, attribution: osmAttribution ,subdomains: '1234'});
+    var mapUrl = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
+    var osmAttribution = '©<a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors';
+    var bg = new L.TileLayer(mapUrl, {maxZoom: 19, attribution: osmAttribution});
     this.map.addLayer(bg);
 
     this.markers = new L.MarkerClusterGroup(this._clusterOptions);
diff --git a/docs/src/view.map.html b/docs/src/view.map.html
index 85c72ff3..3bd2ebdd 100644
--- a/docs/src/view.map.html
+++ b/docs/src/view.map.html
@@ -1016,8 +1016,8 @@ extent if none.</p>
                 <a class="pilcrow" href="#section-38">&#182;</a>
               </div>
               <p>Private: Sets up the Leaflet map control and the features layer.</p>
-<p>The map uses a base layer from <a href="http://www.mapquest.com">MapQuest</a> based
-on <a href="http://openstreetmap.org">OpenStreetMap</a>.</p>
+<p>The map uses a base layer from <a href="http://www.openstreetmap.org">OpenStreetMap</a> based
+on <a href="http://openstreetmap.org">OpenStreetMap data</a>.</p>
 
             </div>
             
diff --git a/src/view.map.js b/src/view.map.js
index 7ef1f8d7..3d858612 100644
--- a/src/view.map.js
+++ b/src/view.map.js
@@ -454,16 +454,16 @@ my.Map = Backbone.View.extend({
 
   // Private: Sets up the Leaflet map control and the features layer.
   //
-  // The map uses a base layer from [MapQuest](http://www.mapquest.com) based
-  // on [OpenStreetMap](http://openstreetmap.org).
+  // The map uses a base layer from [OpenStreetMap.org](http://openstreetmap.org) based
+  // on [OpenStreetMap data](http://openstreetmap.org).
   //
   _setupMap: function(){
     var self = this;
     this.map = new L.Map(this.$map.get(0));
 
-    var mapUrl = "http://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png";
-    var osmAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">';
-    var bg = new L.TileLayer(mapUrl, {maxZoom: 18, attribution: osmAttribution ,subdomains: '1234'});
+    var mapUrl = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
+    var osmAttribution = '©<a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors';
+    var bg = new L.TileLayer(mapUrl, {maxZoom: 19, attribution: osmAttribution});
     this.map.addLayer(bg);
 
     this.markers = new L.MarkerClusterGroup(this._clusterOptions);