diff --git a/packages/initramfs/sysutils/diskdev_cmds-initramfs/install b/packages/initramfs/sysutils/diskdev_cmds-initramfs/install
deleted file mode 100755
index d4c3362dd4..0000000000
--- a/packages/initramfs/sysutils/diskdev_cmds-initramfs/install
+++ /dev/null
@@ -1,28 +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
-
-DISKDEV_CMDS_DIR="$BUILD/diskdev_cmds-*"
-
-mkdir -p $INSTALL/bin
-  cp $DISKDEV_CMDS_DIR/fsck_hfs.tproj/fsck_hfs $INSTALL/bin
diff --git a/packages/initramfs/sysutils/diskdev_cmds-initramfs/meta b/packages/initramfs/sysutils/diskdev_cmds-initramfs/meta
deleted file mode 100644
index a0a814d014..0000000000
--- a/packages/initramfs/sysutils/diskdev_cmds-initramfs/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="diskdev_cmds-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="APSL"
-PKG_SITE="http://src.gnu-darwin.org/DarwinSourceArchive/expanded/diskdev_cmds/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain diskdev_cmds"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/system"
-PKG_SHORTDESC="diskdev_cmds: hfs filesystem utilities"
-PKG_LONGDESC="The fsck and mkfs utliities for hfs and hfsplus filesystems."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/packages/sysutils/diskdev_cmds/build b/packages/sysutils/diskdev_cmds/build
deleted file mode 100755
index 327964c58b..0000000000
--- a/packages/sysutils/diskdev_cmds/build
+++ /dev/null
@@ -1,29 +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
-
-cd $PKG_BUILD
-cwd=`pwd`
-
-make -f Makefile.lnx CC=$CC CFLAGS="$TARGET_CFLAGS -g3 -Wall -I$cwd/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1"
-
diff --git a/packages/sysutils/diskdev_cmds/install b/packages/sysutils/diskdev_cmds/install
deleted file mode 100755
index ecaf2252d5..0000000000
--- a/packages/sysutils/diskdev_cmds/install
+++ /dev/null
@@ -1,28 +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
-
-mkdir -p $INSTALL/bin
-  cp $PKG_BUILD/fsck_hfs.tproj/fsck_hfs $INSTALL/bin
-    ln -sf fsck_hfs $INSTALL/bin/fsck.hfs
-    ln -sf fsck_hfs $INSTALL/bin/fsck.hfsplus
diff --git a/packages/sysutils/diskdev_cmds/meta b/packages/sysutils/diskdev_cmds/package.mk
similarity index 71%
rename from packages/sysutils/diskdev_cmds/meta
rename to packages/sysutils/diskdev_cmds/package.mk
index 12c8807de5..b3192f4a86 100644
--- a/packages/sysutils/diskdev_cmds/meta
+++ b/packages/sysutils/diskdev_cmds/package.mk
@@ -26,11 +26,34 @@ PKG_LICENSE="APSL"
 PKG_SITE="http://src.gnu-darwin.org/DarwinSourceArchive/expanded/diskdev_cmds/"
 PKG_URL="http://www.opensource.apple.com/tarballs/diskdev_cmds/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="openssl"
-PKG_BUILD_DEPENDS="toolchain openssl"
+PKG_BUILD_DEPENDS_TARGET="toolchain openssl"
+PKG_BUILD_DEPENDS_INIT="toolchain openssl diskdev_cmds"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="diskdev_cmds: hfs filesystem utilities"
 PKG_LONGDESC="The fsck and mkfs utliities for hfs and hfsplus filesystems."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_MAKE_OPTS_TARGET="-f Makefile.lnx CC=$CC"
+
+pre_make_target() {
+  export CFLAGS="$TARGET_CFLAGS -g3 -Wall -I$PKG_BUILD/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1"
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/bin
+    cp fsck_hfs.tproj/fsck_hfs $INSTALL/bin
+      ln -sf fsck_hfs $INSTALL/bin/fsck.hfs
+      ln -sf fsck_hfs $INSTALL/bin/fsck.hfsplus
+}
+
+make_init() {
+  : # we reuse make_target()
+}
+
+makeinstall_init() {
+  mkdir -p $INSTALL/bin
+    cp fsck_hfs.tproj/fsck_hfs $INSTALL/bin
+}