diff --git a/10-quirks.conf b/10-quirks.conf
index c9b823c..47907d8 100644
--- a/10-quirks.conf
+++ b/10-quirks.conf
@@ -19,22 +19,6 @@ Section "InputClass"
         Option "IgnoreRelativeAxes" "off"
 EndSection
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=612140
-# please make Evoluent VerticalMouse 3 work out of the box
-# Button mapping on this mouse is quirky
-Section "InputClass"
-	Identifier "Evoluent VerticalMouse 3"
-        MatchProduct "Evoluent VerticalMouse 3"
-        # Sets following configuration:
-        # top button:    left
-        # middle button: middle
-        # bottom button: right
-        # wheel click:   middle
-        # thumb button:  8 (back)
-	Option "ButtonMapping" "1 2 2 4 5 6 7 3 8"
-EndSection
-
-
 # https://bugs.freedesktop.org/show_bug.cgi?id=55867
 # Bug 55867 - Doesn't know how to tag XI_TRACKBALL
 Section "InputClass"
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 119162b..2e0b5b9 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.15.99.902
-Release:   5%{?gitdate:.%{gitdate}}%{dist}
+Release:   6%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -608,6 +608,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Wed May 14 2014 Peter Hutterer <peter.hutterer@redhat.com> - 1.15.99.902-6.20140428
+- Revert button mapping for Evoluent Vertical mouse, the default mapping
+  matches the manufacturer's documentation (#612140)
+
 * Mon Apr 28 2014 Hans de Goede <hdegoede@redhat.com> - 1.15.99.902-5.20140428
 - Add hw/xfree86/Xorg.sh.in to xorg-x11-server-source