diff --git a/NEWS b/NEWS
index 7c29a69..08967b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 2.4.xx
     - Adds support for several auth_token param
     - Adds support for cdn_url in winshaft provider
+    - Add option to jsonp to set custom callback name
+    - Add no_cdn option to windshaft provider
 
 2.4.01
     - fixed rectangle anchor and size #42
diff --git a/lib/torque/provider.windshaft.js b/lib/torque/provider.windshaft.js
index 2b68d0b..df0c69e 100644
--- a/lib/torque/provider.windshaft.js
+++ b/lib/torque/provider.windshaft.js
@@ -353,7 +353,7 @@
     url: function() {
       var opts = this.options;
       var protocol = opts.tiler_protocol || 'http';
-      if (!this.options.cdn_url) {
+      if (!this.options.cdn_url || this.options.no_cdn) {
         return this._tilerHost();
       }
       var h = protocol + "://"