--- xorg-server-1.6.3.ebuild-old	2009-08-16 08:02:56.000000000 +0200
+++ xorg-server-1.6.3.ebuild	2009-08-16 08:03:10.000000000 +0200
@@ -321,6 +321,20 @@
 	eselect opengl set --impl-headers ${OPENGL_DIR}
 }
 
+src_prepare() {
+    x-modular_patch_source
+
+    if use hal; then
+        sed -i \
+            -e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \
+            "${S}"/config/Makefile.am \
+            || die "failed to fix DBUS config directory"
+        SNAPSHOT="yes"
+    fi
+
+    x-modular_reconf_source
+}
+
 src_install() {
 	x-modular_src_install