--- xf86-input-evdev-1.1.2/src/evdev_btn.c.pix	2006-08-31 18:18:45.000000000 +0200
+++ xf86-input-evdev-1.1.2/src/evdev_btn.c	2006-08-31 18:17:45.000000000 +0200
@@ -144,6 +144,16 @@
 	    } while (!clear);
 	}
 
+	{
+	  char *s;
+	  int b1, b2;
+
+	  s = xf86SetStrOption(pInfo->options, "HWheelRelativeAxisButtons", NULL);
+	  if (s && sscanf(s, "%d %d", &b1, &b2) == 2) {
+	    while (b1 == i + base || b2 == i + base) base++;
+	  }
+	}
+
 	if (!fake && base != 1)
 	    fake = i;