diff --git a/packages/debug/mesa-demos/build b/packages/debug/mesa-demos/build
deleted file mode 100755
index e4c5ef4eb1..0000000000
--- a/packages/debug/mesa-demos/build
+++ /dev/null
@@ -1,34 +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
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-
-make
diff --git a/packages/debug/mesa-demos/install b/packages/debug/mesa-demos/install
deleted file mode 100755
index f5870568c8..0000000000
--- a/packages/debug/mesa-demos/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/usr/bin
-  cp $PKG_BUILD/src/xdemos/glxdemo $INSTALL/usr/bin
-  cp $PKG_BUILD/src/xdemos/glxgears $INSTALL/usr/bin
-  cp $PKG_BUILD/src/xdemos/glxinfo $INSTALL/usr/bin
diff --git a/packages/debug/mesa-demos/meta b/packages/debug/mesa-demos/package.mk
similarity index 96%
rename from packages/debug/mesa-demos/meta
rename to packages/debug/mesa-demos/package.mk
index 5a73febaee..12d1e0029a 100644
--- a/packages/debug/mesa-demos/meta
+++ b/packages/debug/mesa-demos/package.mk
@@ -26,11 +26,12 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libX11 glu"
-PKG_BUILD_DEPENDS="toolchain libX11 Mesa glu glew"
+PKG_BUILD_DEPENDS_TARGET="toolchain libX11 Mesa glu glew"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"
 PKG_SHORTDESC="mesa-demos: Mesa 3D demos"
 PKG_LONGDESC="Mesa 3D demos - installed are the well known glxinfo and glxgears."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+