diff -u xserver-xorg-input-vmmouse-12.5.1/debian/patches/series xserver-xorg-input-vmmouse-12.5.1/debian/patches/series
--- xserver-xorg-input-vmmouse-12.5.1/debian/patches/series
+++ xserver-xorg-input-vmmouse-12.5.1/debian/patches/series
@@ -1,0 +2 @@
+fix-mouse-scrolling.patch
diff -u xserver-xorg-input-vmmouse-12.5.1/debian/changelog xserver-xorg-input-vmmouse-12.5.1/debian/changelog
--- xserver-xorg-input-vmmouse-12.5.1/debian/changelog
+++ xserver-xorg-input-vmmouse-12.5.1/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-vmmouse (1:12.5.1-4ubuntu4) jaunty; urgency=low
+
+  * debian/patches/fix-mouse-scrolling.patch: Cherry-pick from upstream
+    (LP: #326050)
+
+ -- Benjamin Drung <benjamin.drung@gmail.com>  Fri, 27 Mar 2009 13:22:04 +0100
+
 xserver-xorg-input-vmmouse (1:12.5.1-4ubuntu3) jaunty; urgency=low
 
   * Add xserver_1_6.patch: With xserver 1.6, the OSmouse code has been
only in patch2:
unchanged:
--- xserver-xorg-input-vmmouse-12.5.1.orig/debian/patches/fix-mouse-scrolling.patch
+++ xserver-xorg-input-vmmouse-12.5.1/debian/patches/fix-mouse-scrolling.patch
@@ -0,0 +1,28 @@
+#
+# Ubuntu: https://launchpad.net/bugs/326050
+# Upstream: http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/commit/?id=305fd77bdf4a8b241c3155b068acf4147a2f8077
+# Description: Change ZAxisMapping default to match main mouse driver.
+
+diff --git a/src/vmmouse.c b/src/vmmouse.c
+index beeed87..99daa92 100644
+--- a/src/vmmouse.c
++++ b/src/vmmouse.c
+@@ -95,7 +95,7 @@
+  */
+ #define VMMOUSE_MAJOR_VERSION 12
+ #define VMMOUSE_MINOR_VERSION 5
+-#define VMMOUSE_PATCHLEVEL 1
++#define VMMOUSE_PATCHLEVEL 2
+ #define VMMOUSE_DRIVER_VERSION \
+    (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
+ #define VMMOUSE_DRIVER_VERSION_STRING \
+@@ -675,7 +675,7 @@ MouseCommonOptions(InputInfoPtr pInfo)
+    /*
+     * Process option for ZAxisMapping
+     */
+-   s = xf86SetStrOption(pInfo->options, "ZAxisMapping", NULL);
++   s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
+    if (s) {
+       int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+       char *msg = NULL;
+