diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js
index 3351c1ebaf..4b2d20a479 100644
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -624,6 +624,20 @@ OpenLayers.Layer = OpenLayers.Class({
             confProps[property] = this.options[property] || this.map[property];
         }
 
+        // Do not use the scales/resolutions at the map level if
+        // minScale/minResolution and maxScale/maxResolution are
+        // specified at the layer level
+        if (this.options.minScale != null &&
+            this.options.maxScale != null &&
+            this.options.scales == null) {
+            confProps.scales = null;
+        }
+        if (this.options.minResolution != null &&
+            this.options.maxResolution != null &&
+            this.options.resolutions == null) {
+            confProps.resolutions = null;
+        }
+
         // If numZoomLevels hasn't been set and the maxZoomLevel *has*, 
         //  then use maxZoomLevel to calculate numZoomLevels
         //