diff --git a/packages/devel/dbus-host/build b/packages/devel/dbus-host/build
new file mode 100755
index 0000000000..5b45e1decc
--- /dev/null
+++ b/packages/devel/dbus-host/build
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build expat-host
+$SCRIPTS/unpack dbus
+
+DBUS_DIR=`ls -d $BUILD/dbus-[0-9]*`
+
+setup_toolchain host
+
+cd $DBUS_DIR
+mkdir -p .build-host
+
+cd .build-host
+../configure --prefix=$ROOT/$TOOLCHAIN \
+             --sysconfdir=$ROOT/$TOOLCHAIN/etc \
+             --disable-tests \
+             --disable-xml-docs \
+             --disable-doxygen-docs \
+             --enable-asserts=yes \
+
+make
+make install
+
+$ROOT/$TOOLCHAIN/bin/dbus-daemon --introspect > introspect.xml
diff --git a/packages/devel/dbus/build b/packages/devel/dbus/build
index 580c3f12e8..1b269297d7 100755
--- a/packages/devel/dbus/build
+++ b/packages/devel/dbus/build
@@ -4,39 +4,42 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build expat
+$SCRIPTS/build libX11
 
 export ac_cv_have_abstract_sockets=set
 
-export CFLAGS="$CFLAGS -I$LIB_PREFIX/include"
-export LDFLAGS="$LDFLAGS -L$LIB_PREFIX/lib"
+export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib"
 
 cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-tests \
-            --disable-ansi \
-            --disable-verbose-mode \
-            --disable-asserts \
-            --disable-checks \
-            --disable-xml-docs \
-            --disable-doxygen-docs \
-            --disable-gcov  \
-            --enable-abstract-sockets \
-            --disable-selinux \
-            --disable-libaudit \
-            --disable-dnotify \
-            --enable-inotify \
-            --with-xml=expat \
-            --without-x \
-            --with-dbus-user=dbus \
+
+mkdir -p .build-target
+cd .build-target
+
+../configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
+             --sysconfdir=/etc \
+             --localstatedir=/var \
+             --disable-static \
+             --enable-shared \
+             --disable-tests \
+             --disable-ansi \
+             --disable-verbose-mode \
+             --disable-asserts \
+             --disable-checks \
+             --disable-xml-docs \
+             --disable-doxygen-docs \
+             --disable-gcov  \
+             --enable-abstract-sockets \
+             --disable-selinux \
+             --disable-libaudit \
+             --disable-dnotify \
+             --enable-inotify \
+             --with-xml=expat \
+             --with-x \
+             --with-dbus-user=dbus \
 
 make
 
-make -C dbus DESTDIR=$SYSROOT_PREFIX install
-make DESTDIR=$SYSROOT_PREFIX install-pkgconfigDATA
-
+$MAKEINSTALL
diff --git a/packages/devel/dbus/install b/packages/devel/dbus/install
index 64ef2b3987..b7ba34858b 100755
--- a/packages/devel/dbus/install
+++ b/packages/devel/dbus/install
@@ -3,30 +3,31 @@
 . config/options
 
 $SCRIPTS/install expat
+$SCRIPTS/install libX11
 
 add_user dbus x 81 81 "System message bus" "/" "/bin/sh"
 add_group dbus 81
 add_group netdev 497
 
-mkdir -p $INSTALL/usr/share/dbus-1/services
-mkdir -p $INSTALL/usr/share/dbus-1/system-services
-
 mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/bus/dbus-daemon $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/.libs/dbus-uuidgen $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/dbus-launch $INSTALL/usr/bin
-  cp $PKG_BUILD/tools/.libs/dbus-send $INSTALL/usr/bin #DEVTOOLS only
+  cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin
+  cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin
+  cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin
+  cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin #DEVTOOLS only
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
+  cp -PR $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dbus-1.0
-  cp $PKG_BUILD/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus-1.0
+  cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus-1.0
 
 mkdir -p $INSTALL/etc/dbus-1/event.d
 mkdir -p $INSTALL/etc/dbus-1/system.d
 mkdir -p $INSTALL/etc/dbus-1/session.d
 
-cp $PKG_BUILD/bus/session.conf $INSTALL/etc/dbus-1
+mkdir -p $INSTALL/usr/share/dbus-1/services
+mkdir -p $INSTALL/usr/share/dbus-1/system-services
+
+cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1
   sed 's%<servicehelper>.*</servicehelper>%<servicehelper>/usr/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>%' \
-    $PKG_BUILD/bus/system.conf > $INSTALL/etc/dbus-1/system.conf
+    $PKG_BUILD/.build-target/bus/system.conf > $INSTALL/etc/dbus-1/system.conf