diff --git a/packages/devel/dbus-glib-host/meta b/packages/devel/dbus-glib-host/meta
index 4ca0904d51..842c55bb0a 100644
--- a/packages/devel/dbus-glib-host/meta
+++ b/packages/devel/dbus-glib-host/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/dbus"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain glib-host dbus-host"
+PKG_BUILD_DEPENDS="toolchain glib-host dbus:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="dbus-glib: A message bus system"
diff --git a/packages/sysutils/dbus-host/build b/packages/sysutils/dbus-host/build
deleted file mode 100755
index 1c9f9c32f3..0000000000
--- a/packages/sysutils/dbus-host/build
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-$SCRIPTS/unpack dbus
-
-DBUS_DIR=`ls -d $BUILD/dbus-[0-9]*`
-
-setup_toolchain host
-
-cd $DBUS_DIR
-
-do_autoreconf
-
-mkdir -p .build-host && cd .build-host
-../configure --host=$HOST_NAME \
-             --build=$HOST_NAME \
-             --prefix=$ROOT/$TOOLCHAIN \
-             --sysconfdir=$ROOT/$TOOLCHAIN/etc \
-             --enable-verbose-mode \
-             --enable-asserts \
-             --enable-checks \
-             --disable-tests \
-             --disable-xml-docs \
-             --disable-doxygen-docs \
-
-make
-make install
-
-$ROOT/$TOOLCHAIN/bin/dbus-daemon --introspect > introspect.xml
diff --git a/packages/sysutils/dbus-host/meta b/packages/sysutils/dbus-host/meta
deleted file mode 100644
index c2a814d55a..0000000000
--- a/packages/sysutils/dbus-host/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="dbus-host"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://dbus.freedesktop.org"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain expat:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="dbus: simple interprocess messaging system"
-PKG_LONGDESC="D-Bus is a message bus, used for sending messages between applications. This package contains the D-Bus daemon and related utilities and the dbus shared library."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/packages/sysutils/dbus/build b/packages/sysutils/dbus/build
deleted file mode 100755
index a769e20805..0000000000
--- a/packages/sysutils/dbus/build
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-export ac_cv_have_abstract_sockets=yes
-
-cd $PKG_BUILD
-mkdir -p .build-target && cd .build-target
-../configure --host=$TARGET_NAME \
-             --build=$HOST_NAME \
-             --prefix=/usr \
-             --sysconfdir=/etc \
-             --libexecdir=/usr/lib/dbus \
-             --localstatedir=/var \
-             --disable-static \
-             --enable-shared \
-             --enable-verbose-mode \
-             --enable-asserts \
-             --enable-checks \
-             --disable-tests \
-             --disable-ansi \
-             --disable-xml-docs \
-             --disable-doxygen-docs \
-             --enable-abstract-sockets \
-             --disable-x11-autolaunch \
-             --disable-selinux \
-             --disable-libaudit \
-             --enable-dnotify \
-             --enable-inotify \
-             --with-xml=expat \
-             --without-x \
-             --with-dbus-user=dbus \
-
-make
-
-$MAKEINSTALL
diff --git a/packages/sysutils/dbus/install b/packages/sysutils/dbus/install
deleted file mode 100755
index 7cc5f5c8fc..0000000000
--- a/packages/sysutils/dbus/install
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-add_user dbus x 81 81 "System message bus" "/" "/bin/sh"
-add_group dbus 81
-add_group netdev 497
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin
-  cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin
-  cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin
-  cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin
-  cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin
-#  cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/lib/dbus
-  cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus
-    echo "chmod 4750 $INSTALL/usr/lib/dbus/dbus-daemon-launch-helper" >> $FAKEROOT_SCRIPT
-    echo "chown 0:81 $INSTALL/usr/lib/dbus/dbus-daemon-launch-helper" >> $FAKEROOT_SCRIPT
-
-mkdir -p $INSTALL/etc/dbus-1
-  cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1
-  cp $PKG_BUILD/.build-target/bus/system.conf $INSTALL/etc/dbus-1
-
-mkdir -p $INSTALL/etc/dbus-1/system.d
-mkdir -p $INSTALL/etc/dbus-1/session.d
-mkdir -p $INSTALL/usr/share/dbus-1/services
-mkdir -p $INSTALL/usr/share/dbus-1/system-services
diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta
deleted file mode 100644
index 8a3feb1ef2..0000000000
--- a/packages/sysutils/dbus/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="dbus"
-PKG_VERSION="1.6.12"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://dbus.freedesktop.org"
-PKG_URL="http://dbus.freedesktop.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="expat"
-PKG_BUILD_DEPENDS="toolchain expat"
-PKG_PRIORITY="required"
-PKG_SECTION="system"
-PKG_SHORTDESC="dbus: simple interprocess messaging system"
-PKG_LONGDESC="D-Bus is a message bus, used for sending messages between applications. This package contains the D-Bus daemon and related utilities and the dbus shared library."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
diff --git a/packages/sysutils/dbus/package.mk b/packages/sysutils/dbus/package.mk
new file mode 100644
index 0000000000..b877a41fae
--- /dev/null
+++ b/packages/sysutils/dbus/package.mk
@@ -0,0 +1,83 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="dbus"
+PKG_VERSION="1.6.12"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://dbus.freedesktop.org"
+PKG_URL="http://dbus.freedesktop.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="expat"
+PKG_BUILD_DEPENDS_TARGET="toolchain expat"
+PKG_BUILD_DEPENDS_HOST="toolchain expat:host"
+PKG_PRIORITY="required"
+PKG_SECTION="system"
+PKG_SHORTDESC="dbus: simple interprocess messaging system"
+PKG_LONGDESC="D-Bus is a message bus, used for sending messages between applications. This package contains the D-Bus daemon and related utilities and the dbus shared library."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
+                           --libexecdir=/usr/lib/dbus \
+                           --enable-verbose-mode \
+                           --enable-asserts \
+                           --enable-checks \
+                           --disable-tests \
+                           --disable-ansi \
+                           --disable-xml-docs \
+                           --disable-doxygen-docs \
+                           --enable-abstract-sockets \
+                           --disable-x11-autolaunch \
+                           --disable-selinux \
+                           --disable-libaudit \
+                           --disable-systemd \
+                           --enable-dnotify \
+                           --enable-inotify \
+                           --with-xml=expat \
+                           --without-x \
+                           --with-dbus-user=dbus"
+
+PKG_CONFIGURE_OPTS_HOST="--enable-verbose-mode \
+                         --enable-asserts \
+                         --enable-checks \
+                         --disable-tests \
+                         --disable-xml-docs \
+                         --disable-doxygen-docs"
+
+post_makeinstall_host() {
+  $ROOT/$TOOLCHAIN/bin/dbus-daemon --introspect > introspect.xml
+}
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/lib/systemd
+  rm -rf $INSTALL/etc/rc.d
+  rm -rf $INSTALL/usr/lib/dbus-1.0/include
+}
+
+post_install() {
+  add_user dbus x 81 81 "System message bus" "/" "/bin/sh"
+  add_group dbus 81
+  add_group netdev 497
+
+  echo "chmod 4750 $INSTALL/usr/lib/dbus/dbus-daemon-launch-helper" >> $FAKEROOT_SCRIPT
+  echo "chown 0:81 $INSTALL/usr/lib/dbus/dbus-daemon-launch-helper" >> $FAKEROOT_SCRIPT
+}