diff --git a/packages/initramfs/meta b/packages/initramfs/meta
index 6bbab40a01..a7cd1ce35f 100644
--- a/packages/initramfs/meta
+++ b/packages/initramfs/meta
@@ -36,5 +36,5 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 if [ "$HFSTOOLS" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs"
+  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds-initramfs util-linux-initramfs"
 fi
diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index c6e8c4eede..e11f839414 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -115,8 +115,26 @@ REBOOT="0"
     fi
   }
 
+  hfsdiskprep() {
+    for DEV in `/bin/busybox ls /dev/sd*`; do
+      FS_TYPE=$(/sbin/blkid -o value -s TYPE $DEV)
+      if [ "$FS_TYPE" = "hfs" -o "$FS_TYPE" = "hfsplus" ]; then
+        /sbin/fsck_hfs -r -y $DEV > /dev/null 2>&1
+      fi
+    done
+  }
+
+# deal with hfs partitions
+  if [ -x /sbin/fsck_hfs ]; then
+    hfsdiskprep
+  fi
+
   mount_part "$boot" "/flash" "ro,noatime"
 
+  if [ -f "/flash/atv_single_boot" ]; then
+    IMAGE_KERNEL="MACH_KERNEL"
+  fi
+
   show_splash
 
   if [ -n "$disk" ]; then
diff --git a/packages/initramfs/sysutils/util-linux-initramfs/install b/packages/initramfs/sysutils/util-linux-initramfs/install
new file mode 100755
index 0000000000..67aeeddaa2
--- /dev/null
+++ b/packages/initramfs/sysutils/util-linux-initramfs/install
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+UTIL_LINUX_DIR="$BUILD/util-linux-*"
+
+mkdir -p $INSTALL/sbin
+  cp $UTIL_LINUX_DIR/misc-utils/blkid $INSTALL/sbin
diff --git a/packages/initramfs/sysutils/util-linux-initramfs/meta b/packages/initramfs/sysutils/util-linux-initramfs/meta
new file mode 100644
index 0000000000..6b38110560
--- /dev/null
+++ b/packages/initramfs/sysutils/util-linux-initramfs/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="util-linux-initramfs"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APSL"
+PKG_SITE="http://userweb.kernel.org/~kzak/util-linux-ng/"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain util-linux"
+PKG_PRIORITY="optional"
+PKG_SECTION="initramfs/system"
+PKG_SHORTDESC="util-linux: Miscellaneous system utilities for Linux"
+PKG_LONGDESC="The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among many features, Util-linux contains the fdisk configuration tool and the login program."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"