diff --git a/driver/Makefile b/driver/Makefile
index 02a732d7d..61fbc925e 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2011/09/10 17:52:09 matthieu Exp $
+# $OpenBSD: Makefile,v 1.39 2011/11/05 14:32:44 matthieu Exp $
 
 # The input driver ABI broke between xserver 1.9 and 1.10. 
 # Some drivers were updated to the new ABI without keeping compatibility
@@ -7,31 +7,17 @@
 # This is going away once xsever 1.11 and associated input drivers 
 # updates are committed
 
-USING_XSERVER_110 != if pkg-config --atleast-version 1.10 xorg-server; then \
-		echo 1; \
-	else \
-		echo 0; \
-	fi
-
 INPUT_DRV_DEFAULT= \
 	xf86-input-keyboard \
 	xf86-input-mouse \
 	xf86-input-usbtablet \
+	xf86-input-void \
 	xf86-input-ws
 
-.if !$(USING_XSERVER_110)
-INPUT_DRV_DEFAULT +=xf86-input-void
-.endif
-
 INPUT_DRV_COMMON = ${INPUT_DRV_DEFAULT} \
-	xf86-input-acecad
-
-.if !$(USING_XSERVER_110)
-INPUT_DRV_COMMON +=\
-	xf86-input-citron xf86-input-elographics xf86-input-fpit \
+	xf86-input-acecad xf86-input-elographics xf86-input-fpit \
 	xf86-input-hyperpen xf86-input-joystick xf86-input-mutouch \
 	xf86-input-penmount
-.endif
 
 INPUT_DRV_alpha=