diff --git a/10-quirks.conf b/10-quirks.conf
index 82d3ec2..c850660 100644
--- a/10-quirks.conf
+++ b/10-quirks.conf
@@ -18,3 +18,19 @@ Section "InputClass"
         Option "IgnoreAbsoluteAxes" "off"
         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 0 0 0 0 3 8"
+EndSection
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index b668b50..7d1c9cd 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.13.99.901
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Release:   4%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -584,6 +584,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Jan 25 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.13.99.901-4
+- Add quirk for Evoluent Vertical Mouse 3, button mapping is quirky
+  (#612140)
+
 * Wed Jan 23 2013 Adam Jackson <ajax@redhat.com> 1.13.99.901-3
 - Bump XI minor for barriers