diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta
index 6984d59d8d..efa69890cf 100644
--- a/packages/mediacenter/xbmc-frodo/meta
+++ b/packages/mediacenter/xbmc-frodo/meta
@@ -82,6 +82,9 @@ fi
 if [ "$CEC_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libcec"
   PKG_DEPENDS="$PKG_DEPENDS libcec"
+  if [ "$OPENMAX" = "bcm2835-driver" ]; then
+    PKG_DEPENDS="$PKG_DEPENDS rpi-cecd"
+  fi
 fi
 
 if [ "$XBMC_SCR_RSXS" = yes ]; then
diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta
index 77ece00140..f74327e374 100644
--- a/packages/mediacenter/xbmc-rpi/meta
+++ b/packages/mediacenter/xbmc-rpi/meta
@@ -78,6 +78,9 @@ fi
 if [ "$CEC_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libcec"
   PKG_DEPENDS="$PKG_DEPENDS libcec"
+  if [ "$OPENMAX" = "bcm2835-driver" ]; then
+    PKG_DEPENDS="$PKG_DEPENDS rpi-cecd"
+  fi
 fi
 
 if [ "$XBMC_SCR_RSXS" = yes ]; then
diff --git a/packages/sysutils/rpi-cecd/build b/packages/sysutils/rpi-cecd/build
new file mode 100755
index 0000000000..72b19e4649
--- /dev/null
+++ b/packages/sysutils/rpi-cecd/build
@@ -0,0 +1,29 @@
+#!/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
+
+CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/"
+
+cd $PKG_BUILD
+
+make
diff --git a/packages/sysutils/rpi-cecd/init.d/64_rpi-cecd b/packages/sysutils/rpi-cecd/init.d/64_rpi-cecd
new file mode 100644
index 0000000000..25784302e7
--- /dev/null
+++ b/packages/sysutils/rpi-cecd/init.d/64_rpi-cecd
@@ -0,0 +1,25 @@
+################################################################################
+#      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
+################################################################################
+# start the RPi-CEC daemon
+#
+# runlevels: openelec
+
+progress "starting RPi-CEC daemon"
+  rpi-cecd > /dev/null 2>&1 &
diff --git a/packages/sysutils/rpi-cecd/install b/packages/sysutils/rpi-cecd/install
new file mode 100755
index 0000000000..f3ec9192f3
--- /dev/null
+++ b/packages/sysutils/rpi-cecd/install
@@ -0,0 +1,26 @@
+#!/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/usr/bin
+  cp -P $PKG_BUILD/rpi-cecd $INSTALL/usr/bin
diff --git a/packages/sysutils/rpi-cecd/meta b/packages/sysutils/rpi-cecd/meta
new file mode 100644
index 0000000000..624d70f719
--- /dev/null
+++ b/packages/sysutils/rpi-cecd/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      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="rpi-cecd"
+PKG_VERSION="07aec6c"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/olajep/rpi-cecd"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="curl bcm2835-driver"
+PKG_BUILD_DEPENDS="toolchain curl bcm2835-driver"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="rpi-cecd: This is a temporary hack to make HDMI-CEC work with OpenElec on Raspberry Pi."
+PKG_LONGDESC="rpi-cecd: This is a temporary hack to make HDMI-CEC work with OpenElec on Raspberry Pi."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"