diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js
index de7ee41b07..bde35edfc2 100644
--- a/lib/OpenLayers/Control/Scale.js
+++ b/lib/OpenLayers/Control/Scale.js
@@ -53,8 +53,9 @@ OpenLayers.Control.Scale.prototype =
         } else if (scale >= 950000) {
             scale = Math.round(scale / 1000000) + "M";
         } else {
-            scale = Math.round(scale / 100) * 100;
-        }
+            scale = Math.round(scale);
+        }    
+        
         this.element.innerHTML = "Scale = 1 : " + scale;
     }, 
     
diff --git a/tests/list-tests.html b/tests/list-tests.html
index 40d524a32a..8f2172d2fe 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -31,5 +31,6 @@
     <li>test_Control_PanZoom.html</li>
     <li>test_Control_PanZoomBar.html</li>
     <li>test_Control_Permalink.html</li>
+    <li>test_Control_Scale.html</li>
     <li>test_Map.html</li>
 </ul>
diff --git a/tests/test_Control_Scale.html b/tests/test_Control_Scale.html
new file mode 100644
index 0000000000..995247730f
--- /dev/null
+++ b/tests/test_Control_Scale.html
@@ -0,0 +1,47 @@
+<html>
+<head>
+  <script src="../lib/OpenLayers.js"></script>
+  <script type="text/javascript"><!--
+    var map; 
+    function test_01_Control_Scale_constructor (t) {
+        t.plan( 1 );
+    
+        control = new OpenLayers.Control.Scale();
+        t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
+    }
+    function test_02_Control_Scale_updateScale (t) {
+        t.plan( 4 );
+    
+        control = new OpenLayers.Control.Scale($('scale'));
+        t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
+        map = new OpenLayers.Map($('map'));
+        layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
+        map.addLayer(layer);
+        map.zoomTo(0);
+        map.addControl(control);
+        t.eq($('scale').innerHTML, "Scale = 1 : 443M", "Scale set by default."  );
+        map.zoomIn();
+        t.eq($('scale').innerHTML, "Scale = 1 : 221M", "Zooming in changes scale"  );
+        map.baseLayer.resolutions = [OpenLayers.Util.getResolutionFromScale(110)];
+        map.zoomTo(0);
+        t.eq($('scale').innerHTML, "Scale = 1 : 110", "Scale of 100 isn't rounded"  );
+    }
+    function test_03_Control_Scale_internalScale (t) {
+        t.plan(2);
+        control = new OpenLayers.Control.Scale();
+        t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
+        map = new OpenLayers.Map($('map'));
+        layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
+        map.addLayer(layer);
+        map.zoomTo(0);
+        map.addControl(control);
+        t.eq(control.div.firstChild.innerHTML, "Scale = 1 : 443M", "Internal scale displayed properly.");
+    }    
+  // -->
+  </script>
+</head>
+<body>
+    <a id="scale" href="">Scale</a> <br />
+    <div id="map" style="width: 1024px; height: 512px;"/>
+</body>
+</html>
