--- xf86-input-evdev-1.1.2.old/src/evdev_btn.c	2006-04-13 14:37:13.000000000 -0400
+++ xf86-input-evdev-1.1.2/src/evdev_btn.c	2006-11-11 18:10:37.000000000 -0500
@@ -173,6 +173,10 @@
 		state->btn->buttons = state->axes->btnMap[i][1];
 	}
     }
+
+    // XXX Fix for Logitech Devices sending extra buttons
+    state->btn->map[6] = 6;
+    state->btn->map[7] = 7;
 }