diff --git a/packages/x11/xserver/xorg-server/config/x11-input.rules b/packages/x11/xserver/xorg-server/config/x11-input.rules
new file mode 100644
index 0000000000..8f0ff359df
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/config/x11-input.rules
@@ -0,0 +1,17 @@
+SUBSYSTEM!="input", GOTO="x11_input_end"
+ACTION!="change|add", GOTO="x11_input_end"
+KERNEL!="event*", GOTO="x11_input_end"
+
+# use the evdev driver by default
+ENV{x11_driver}="evdev"
+
+# set xkb layout if we have keys
+ENV{ID_INPUT_KEY}=="?*", ENV{xkblayout}="us"
+
+# use synaptics for touchpads
+ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="synaptics"
+
+# use wacom for tablet
+ENV{ID_INPUT_TABLET}=="?*", ENV{x11_driver}="wacom"
+
+LABEL="x11_input_end"
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index c485dcfebf..620652fedf 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -15,6 +15,7 @@ $SCRIPTS/install udev
 
 XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"
+PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/usr/bin
   cp $XORG_SRC/Xorg $INSTALL/usr/bin
@@ -49,7 +50,7 @@ mkdir -p $INSTALL/etc/X11
   cp $PKG_BUILD/dix/protocol.txt $INSTALL/etc/X11
 
 mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/config/x11-input.rules $INSTALL/lib/udev/rules.d
+  cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
 
 #Fonts
   $SCRIPTS/install encodings