diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index ad25ebc63c..e415095abd 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -30,9 +30,9 @@ $SCRIPTS/build libfontenc
 $SCRIPTS/build pixman
 $SCRIPTS/build fontsproto
 $SCRIPTS/build xf86bigfontproto
-#$SCRIPTS/build udev
-$SCRIPTS/build dbus
-$SCRIPTS/build hal
+$SCRIPTS/build udev
+#$SCRIPTS/build dbus
+#$SCRIPTS/build hal
 
 if [ "$XINERAMA" = "yes" ]; then
   $SCRIPTS/build libXinerama
@@ -82,9 +82,9 @@ cd $PKG_BUILD
             --enable-dbe \
             --disable-xf86bigfont \
             --disable-dpms \
-            --disable-config-udev \
-            --enable-config-dbus \
-            --enable-config-hal \
+            --enable-config-udev \
+            --disable-config-dbus \
+            --disable-config-hal \
             --enable-xfree86-utils \
             --enable-xorg \
             --disable-dmx \
diff --git a/packages/x11/xserver/xorg-server/config/70-xorg.rules b/packages/x11/xserver/xorg-server/config/70-xorg.rules
new file mode 100644
index 0000000000..982f432fc3
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/config/70-xorg.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="input", KERNEL=="event*", ENV{x11_driver}="evdev"
+SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_CLASS}=="kbd", ENV{xkb.layout}="us", ENV{xkb.options}="terminate:ctrl_alt_bksp,compose:lwin"
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index c6c948fe38..0787910376 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -10,9 +10,9 @@ $SCRIPTS/install libXv
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman
-#$SCRIPTS/install udev
-$SCRIPTS/install dbus
-$SCRIPTS/install hal
+$SCRIPTS/install udev
+#$SCRIPTS/install dbus
+#$SCRIPTS/install hal
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
@@ -24,41 +24,44 @@ XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"
 
 mkdir -p $INSTALL/usr/bin
-cp $XORG_SRC/Xorg $INSTALL/usr/bin
+  cp $XORG_SRC/Xorg $INSTALL/usr/bin
 
 mkdir -p $XORG_DST
-cp $XORG_SRC/exa/.libs/libexa.so $XORG_DST
-cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST
-cp $XORG_SRC/int10/.libs/libint10.so $XORG_DST
-cp $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST
-cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
-cp $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST
-cp $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST
-cp $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST
-cp $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST
-cp $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST
+  cp $XORG_SRC/exa/.libs/libexa.so $XORG_DST
+  cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST
+  cp $XORG_SRC/int10/.libs/libint10.so $XORG_DST
+  cp $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST
+  cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
+  cp $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST
+  cp $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST
+  cp $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST
+  cp $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST
+  cp $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST
 
 mkdir -p $XORG_DST/extensions
-cp $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
-cp $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
-cp $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
-cp $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
-cp $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions 
+  cp $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
+  cp $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
+  cp $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
+  cp $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
+  cp $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions 
 
 mkdir -p $XORG_DST/linux
-cp $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux
+  cp $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux
 
 mkdir -p $XORG_DST/multimedia
-cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
+  cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
 
 mkdir -p $INSTALL/etc/X11
-cp $PKG_BUILD/dix/protocol.txt $INSTALL/etc/X11
+  cp $PKG_BUILD/dix/protocol.txt $INSTALL/etc/X11
 
-mkdir -p $INSTALL/etc/dbus-1/system.d
-cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
+#mkdir -p $INSTALL/etc/dbus-1/system.d
+#  cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
 
-mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
-cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+#mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
+#  cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+
+mkdir -p $INSTALL/lib/udev/rules.d
+  cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
 
 #Fonts
   $SCRIPTS/install encodings
@@ -72,6 +75,8 @@ cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/
 
 #Drivers
   $SCRIPTS/install xf86-input-evdev
+  $SCRIPTS/install xf86-input-synaptics
+  $SCRIPTS/install xf86-input-wacom
 
 get_graphicdrivers
 
@@ -80,4 +85,4 @@ get_graphicdrivers
   done
 
 #Tools
-  $SCRIPTS/install xrandr
+#  $SCRIPTS/install xrandr