diff --git a/10-quirks.conf b/10-quirks.conf
index c850660..b33d13f 100644
--- a/10-quirks.conf
+++ b/10-quirks.conf
@@ -31,6 +31,6 @@ Section "InputClass"
         # bottom button: right
         # wheel click:   middle
         # thumb button:  8 (back)
-	Option "ButtonMapping" "1 2 2 0 0 0 0 3 8"
+	Option "ButtonMapping" "1 2 2 4 5 6 7 3 8"
 EndSection
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7d1c9cd..284bdc4 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:   4%{?gitdate:.%{gitdate}}%{dist}
+Release:   5%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -584,6 +584,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Feb 14 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.13.99.901-5
+- Fix scrolling for Evoluent Vertical Mouse 3 (#612140#c20)
+
 * 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)