diff --git a/d3.behavior.js b/d3.behavior.js
index 0300e7962908c..a2638f345bde1 100644
--- a/d3.behavior.js
+++ b/d3.behavior.js
@@ -3,10 +3,7 @@
 // TODO unbind listener?
 d3.behavior.zoom = function() {
 
-  // https://bugs.webkit.org/show_bug.cgi?id=40441
-  var bug40441 = /WebKit\/533/.test(navigator.userAgent) ? -1 : 0,
-      bug40441Last = 0,
-      x = 0,
+  var x = 0,
       y = 0,
       z = 0,
       listeners = [],
@@ -53,6 +50,20 @@ d3.behavior.zoom = function() {
     }
   }
 
+  // mousewheel events are totally broken!
+  // https://bugs.webkit.org/show_bug.cgi?id=40441
+  // not only that, but Chrome and Safari differ in re. to acceleration!
+  var inner = document.createElement("div"),
+      outer = document.createElement("div");
+  outer.style.visibility = "hidden";
+  outer.style.top = "0px";
+  outer.style.height = "0px";
+  outer.style.width = "0px";
+  outer.style.overflowY = "scroll";
+  inner.style.height = "2000px";
+  outer.appendChild(inner);
+  document.body.appendChild(outer);
+
   function mousewheel(d, i) {
     var e = d3.event;
 
@@ -72,16 +83,17 @@ d3.behavior.zoom = function() {
     if (e.type === "dblclick") {
       z = e.shiftKey ? Math.ceil(z - 1) : Math.floor(z + 1);
     } else {
-     var delta = (e.wheelDelta / 120 || -e.detail) * .1;
-
-      /* Detect fast & large wheel events on WebKit. */
-      if (bug40441 < 0) {
-        var now = Date.now(), since = now - bug40441Last;
-        if ((since > 9) && (Math.abs(e.wheelDelta) / since >= 50)) bug40441 = 1;
-        bug40441Last = now;
+      var delta = e.wheelDelta || -e.detail;
+      if (delta) {
+        try {
+          outer.scrollTop = 1000;
+          outer.dispatchEvent(e);
+          delta = 1000 - outer.scrollTop;
+        } catch (error) {
+          // Derp! Hope for the best?
+        }
+        delta *= .005;
       }
-      if (bug40441 === 1) delta *= .03;
-
       z += delta;
     }
 
diff --git a/d3.behavior.min.js b/d3.behavior.min.js
index 84616107cc1f9..2c5ae7dafbd5a 100644
--- a/d3.behavior.min.js
+++ b/d3.behavior.min.js
@@ -1 +1 @@
-(function(){d3.behavior={},d3.behavior.zoom=function(){function m(a,b){function i(a,b){var c=a.__domain||(a.__domain=a.domain()),d=a.range().map(function(a){return(a-b)/h});a.domain(c).domain(d.map(a.invert))}var g=d3.event,h=Math.pow(2,e);d3.event={scale:h,translate:[c,d],transform:function(a,b){a&&i(a,c),b&&i(b,d)}};try{for(var j=0,k=f.length;j<k;j++)f[j].call(this,a,b)}finally{d3.event=g}}function l(f,g){var i=d3.event;if(!h){var j=d3.svg.mouse(this.nearestViewportElement||this);h={x0:c,y0:d,z0:e,x1:c-j[0],y1:d-j[1]}}if(i.type==="dblclick")e=i.shiftKey?Math.ceil(e-1):Math.floor(e+1);else{var k=(i.wheelDelta/120||-i.detail)*.1;if(a<0){var l=Date.now(),n=l-b;n>9&&Math.abs(i.wheelDelta)/n>=50&&(a=1),b=l}a===1&&(k*=.03),e+=k}var o=Math.pow(2,e-h.z0)-1;c=h.x0+h.x1*o,d=h.y0+h.y1*o,m.call(this,f,g)}function k(){g&&(j(),g=null)}function j(){h=null,g&&(c=d3.event.clientX+g.x0,d=d3.event.clientY+g.y0,m.call(g.target,g.data,g.index))}function i(a,b){g={x0:c-d3.event.clientX,y0:d-d3.event.clientY,target:this,data:a,index:b},d3.event.preventDefault(),window.focus()}function h(){var a=this.on("mousedown",i).on("mousewheel",l).on("DOMMouseScroll",l).on("dblclick",l);d3.select(window).on("mousemove",j).on("mouseup",k)}var a=/WebKit\/533/.test(navigator.userAgent)?-1:0,b=0,c=0,d=0,e=0,f=[],g,h;h.on=function(a,b){a=="zoom"&&f.push(b);return h};return h}})()
\ No newline at end of file
+(function(){d3.behavior={},d3.behavior.zoom=function(){function m(e,f){function i(a,b){var c=a.__domain||(a.__domain=a.domain()),d=a.range().map(function(a){return(a-b)/h});a.domain(c).domain(d.map(a.invert))}var g=d3.event,h=Math.pow(2,c);d3.event={scale:h,translate:[a,b],transform:function(c,d){c&&i(c,a),d&&i(d,b)}};try{for(var j=0,k=d.length;j<k;j++)d[j].call(this,e,f)}finally{d3.event=g}}function l(d,e){var g=d3.event;if(!f){var h=d3.svg.mouse(this.nearestViewportElement||this);f={x0:a,y0:b,z0:c,x1:a-h[0],y1:b-h[1]}}if(g.type==="dblclick")c=g.shiftKey?Math.ceil(c-1):Math.floor(c+1);else{var i=g.wheelDelta||-g.detail;if(i){try{k.scrollTop=1e3,k.dispatchEvent(g),i=1e3-k.scrollTop}catch(j){}i*=.005}c+=i}var l=Math.pow(2,c-f.z0)-1;a=f.x0+f.x1*l,b=f.y0+f.y1*l,m.call(this,d,e)}function i(){e&&(h(),e=null)}function h(){f=null,e&&(a=d3.event.clientX+e.x0,b=d3.event.clientY+e.y0,m.call(e.target,e.data,e.index))}function g(c,d){e={x0:a-d3.event.clientX,y0:b-d3.event.clientY,target:this,data:c,index:d},d3.event.preventDefault(),window.focus()}function f(){var a=this.on("mousedown",g).on("mousewheel",l).on("DOMMouseScroll",l).on("dblclick",l);d3.select(window).on("mousemove",h).on("mouseup",i)}var a=0,b=0,c=0,d=[],e,f,j=document.createElement("div"),k=document.createElement("div");k.style.visibility="hidden",k.style.top="0px",k.style.height="0px",k.style.width="0px",k.style.overflowY="scroll",j.style.height="2000px",k.appendChild(j),document.body.appendChild(k),f.on=function(a,b){a=="zoom"&&d.push(b);return f};return f}})()
\ No newline at end of file
diff --git a/src/behavior/zoom.js b/src/behavior/zoom.js
index 786dca4960314..925bc83c10645 100644
--- a/src/behavior/zoom.js
+++ b/src/behavior/zoom.js
@@ -2,10 +2,7 @@
 // TODO unbind listener?
 d3.behavior.zoom = function() {
 
-  // https://bugs.webkit.org/show_bug.cgi?id=40441
-  var bug40441 = /WebKit\/533/.test(navigator.userAgent) ? -1 : 0,
-      bug40441Last = 0,
-      x = 0,
+  var x = 0,
       y = 0,
       z = 0,
       listeners = [],
@@ -52,6 +49,20 @@ d3.behavior.zoom = function() {
     }
   }
 
+  // mousewheel events are totally broken!
+  // https://bugs.webkit.org/show_bug.cgi?id=40441
+  // not only that, but Chrome and Safari differ in re. to acceleration!
+  var inner = document.createElement("div"),
+      outer = document.createElement("div");
+  outer.style.visibility = "hidden";
+  outer.style.top = "0px";
+  outer.style.height = "0px";
+  outer.style.width = "0px";
+  outer.style.overflowY = "scroll";
+  inner.style.height = "2000px";
+  outer.appendChild(inner);
+  document.body.appendChild(outer);
+
   function mousewheel(d, i) {
     var e = d3.event;
 
@@ -71,16 +82,17 @@ d3.behavior.zoom = function() {
     if (e.type === "dblclick") {
       z = e.shiftKey ? Math.ceil(z - 1) : Math.floor(z + 1);
     } else {
-     var delta = (e.wheelDelta / 120 || -e.detail) * .1;
-
-      /* Detect fast & large wheel events on WebKit. */
-      if (bug40441 < 0) {
-        var now = Date.now(), since = now - bug40441Last;
-        if ((since > 9) && (Math.abs(e.wheelDelta) / since >= 50)) bug40441 = 1;
-        bug40441Last = now;
+      var delta = e.wheelDelta || -e.detail;
+      if (delta) {
+        try {
+          outer.scrollTop = 1000;
+          outer.dispatchEvent(e);
+          delta = 1000 - outer.scrollTop;
+        } catch (error) {
+          // Derp! Hope for the best?
+        }
+        delta *= .005;
       }
-      if (bug40441 === 1) delta *= .03;
-
       z += delta;
     }