diff --git a/ChangeLog b/ChangeLog
index eaa1354..794a881 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-15  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/x11/XGServerEvent.m (-processEvent:): Coalesce
+	mousewheel events
+
 2012-01-15  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/x11/XGServer.m: Don't read X events in NSConnectionReplyMode
diff --git a/Source/x11/XGServerEvent.m b/Source/x11/XGServerEvent.m
index 5cca442..181bb75 100644
--- a/Source/x11/XGServerEvent.m
+++ b/Source/x11/XGServerEvent.m
@@ -350,6 +350,7 @@ posixFileDescriptor: (NSPosixFileDescriptor*)fileDescriptor
   NSGraphicsContext *gcontext;
   float deltaX;
   float deltaY;
+  float scrollDelta = 1;
   int buttonNumber;
 
   gcontext = GSCurrentContext();
@@ -363,6 +364,38 @@ posixFileDescriptor: (NSPosixFileDescriptor*)fileDescriptor
                 xEvent.xbutton.time %lu timeOfLastClick %lu \n",
                     xEvent.xbutton.window, xEvent.xbutton.time,
                     generic.lastClick);
+
+	/*
+	 * Compress scroll events to avoid flooding
+	 */
+	if ((xEvent.xbutton.button == generic.scrollLeftMouse
+	     && generic.scrollLeftMouse != 0) ||
+	    (xEvent.xbutton.button == generic.scrollRightMouse
+	     && generic.scrollRightMouse != 0) ||
+	    (xEvent.xbutton.button == generic.upMouse
+	     && generic.upMouse != 0) ||
+	    (xEvent.xbutton.button == generic.downMouse 
+	     && generic.downMouse != 0))
+	  {
+	    XEvent peek;
+	    while (XCheckTypedWindowEvent(xEvent.xbutton.display,
+					  xEvent.xbutton.window,
+					  ButtonPress,
+					  &peek))
+	      {
+		if (xEvent.xbutton.button == peek.xbutton.button
+		    && xEvent.xbutton.x == peek.xbutton.x
+		    && xEvent.xbutton.y == peek.xbutton.y)
+		  {
+		    scrollDelta += 1.0;
+		  }
+		else
+		  {
+		    break;
+		  }
+	      }
+	  }
+
         /*
          * hardwired test for a double click
          *
@@ -433,28 +466,28 @@ posixFileDescriptor: (NSPosixFileDescriptor*)fileDescriptor
         else if (xEvent.xbutton.button == generic.upMouse
           && generic.upMouse != 0)
           {
-            deltaY = 1.;
+            deltaY = scrollDelta;
             eventType = NSScrollWheel;
             buttonNumber = generic.upMouse;
           }
         else if (xEvent.xbutton.button == generic.downMouse
           && generic.downMouse != 0)
           {
-            deltaY = -1.;
+            deltaY = -scrollDelta;
             eventType = NSScrollWheel;
             buttonNumber = generic.downMouse;
           }
         else if (xEvent.xbutton.button == generic.scrollLeftMouse
           && generic.scrollLeftMouse != 0)
           {
-            deltaX = -1.;
+            deltaX = -scrollDelta;
             eventType = NSScrollWheel;
             buttonNumber = generic.scrollLeftMouse;
           }
         else if (xEvent.xbutton.button == generic.scrollRightMouse
           && generic.scrollRightMouse != 0)
           {
-            deltaX = 1.;
+            deltaX = scrollDelta;
             eventType = NSScrollWheel;
             buttonNumber = generic.scrollRightMouse;
           }