diff --git a/packages/devel/libcec/build b/packages/devel/libcec/build
deleted file mode 100755
index 405d258824..0000000000
--- a/packages/devel/libcec/build
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
-  BCM2835_INCLUDES="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
-                    -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
-  CFLAGS="$CFLAGS $BCM2835_INCLUDES"
-  CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES"
-  LIBCEC_RPI="--enable-rpi --with-rpi-include-path=$SYSROOT_PREFIX/usr/include --with-rpi-lib-path=$SYSROOT_PREFIX/usr/lib"
-else
-  LIBCEC_RPI="--disable-rpi"
-fi
-
-# dont use some optimizations because of build problems
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
-            $LIBCEC_RPI \
-           --disable-cubox
-
-make
-
-$MAKEINSTALL
diff --git a/packages/devel/libcec/install b/packages/devel/libcec/install
deleted file mode 100755
index 8416ff1d4e..0000000000
--- a/packages/devel/libcec/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/lib/.libs/*.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/src/testclient/cec-client $INSTALL/usr/bin
diff --git a/packages/devel/libcec/meta b/packages/devel/libcec/package.mk
similarity index 64%
rename from packages/devel/libcec/meta
rename to packages/devel/libcec/package.mk
index 9f9a8210c1..1b93e612df 100644
--- a/packages/devel/libcec/meta
+++ b/packages/devel/libcec/package.mk
@@ -23,17 +23,36 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
 PKG_URL="http://packages.pulse-eight.net/pulse/sources/libcec/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="systemd"
-PKG_BUILD_DEPENDS="toolchain systemd lockdev"
+PKG_DEPENDS_TARGET="systemd"
+PKG_BUILD_DEPENDS_TARGET="toolchain systemd lockdev"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"
 PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+PKG_CONFIGURE_OPTS_TARGET="--disable-cubox"
+
 if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then
   PKG_DEPENDS="$PKG_DEPENDS bcm2835-driver"
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS bcm2835-driver"
+
+  export CFLAGS="$CFLAGS \
+                 -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
+                 -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
+  export CXXFLAGS="$CXXFLAGS \
+                   -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
+                   -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
+
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-rpi \
+                             --with-rpi-include-path=$SYSROOT_PREFIX/usr/include \
+                             --with-rpi-lib-path=$SYSROOT_PREFIX/usr/lib"
+else
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-rpi"
 fi
+
+
+# dont use some optimizations because of build problems
+  export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`