diff --git a/examples/mapbox.js b/examples/mapbox.js
index 0be24970f5..c22116d126 100644
--- a/examples/mapbox.js
+++ b/examples/mapbox.js
@@ -6,9 +6,12 @@ var streets = new OpenLayers.Layer.XYZ(
         "http://c.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png",
         "http://d.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png"
     ], {
-        attribution: "<a href='http://mapbox.com'>MapBox</a> | <a href='http://mapbox.com/tos/'>Terms of Service</a>",
+        attribution: "Tiles © <a href='http://mapbox.com/'>MapBox</a> | " + 
+            "Data © <a href='http://www.openstreetmap.org/'>OpenStreetMap</a> " +
+            "and contributors, CC-BY-SA",
         sphericalMercator: true,
         transitionEffect: "resize",
+        buffer: 1,
         numZoomLevels: 16
     }
 );
@@ -19,13 +22,14 @@ var map = new OpenLayers.Map({
     layers: [streets],
     controls: [
         new OpenLayers.Control.Attribution(),
-        new OpenLayers.Control.TouchNavigation({
+        new OpenLayers.Control.Navigation({
             dragPanOptions: {
                 enableKinetic: true
             }
         }),
         new OpenLayers.Control.ZoomPanel(),
         new OpenLayers.Control.Permalink({anchor: true})
-    ]
+    ],
+    center: [0, 0],
+    zoom: 1
 });
-map.setCenter([0, 0], 1);