diff --git a/packages/debug/mesa-demos/build b/packages/debug/mesa-demos/build
index 1c61867820..18a451af7d 100755
--- a/packages/debug/mesa-demos/build
+++ b/packages/debug/mesa-demos/build
@@ -2,11 +2,6 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-$SCRIPTS/build libX11
-$SCRIPTS/build Mesa
-$SCRIPTS/build glew
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/packages/debug/mesa-demos/install b/packages/debug/mesa-demos/install
index 4dd826ce32..27269826c4 100755
--- a/packages/debug/mesa-demos/install
+++ b/packages/debug/mesa-demos/install
@@ -2,10 +2,6 @@
 
 . config/options $1
 
-$SCRIPTS/install libX11
-$SCRIPTS/install Mesa
-$SCRIPTS/install glew
-
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/src/xdemos/glxdemo $INSTALL/usr/bin
   cp $PKG_BUILD/src/xdemos/glxgears $INSTALL/usr/bin
diff --git a/packages/debug/mesa-demos/meta b/packages/debug/mesa-demos/meta
new file mode 100644
index 0000000000..a3a600b2fc
--- /dev/null
+++ b/packages/debug/mesa-demos/meta
@@ -0,0 +1,14 @@
+PKG_NAME="mesa-demos"
+PKG_VERSION="8.0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+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 Mesa glew"
+PKG_BUILD_DEPENDS="toolchain libX11 Mesa 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"
diff --git a/packages/debug/mesa-demos/url b/packages/debug/mesa-demos/url
deleted file mode 100644
index a4475f5458..0000000000
--- a/packages/debug/mesa-demos/url
+++ /dev/null
@@ -1 +0,0 @@
-ftp://ftp.freedesktop.org/pub/mesa/demos/8.0.1/mesa-demos-8.0.1.tar.bz2
\ No newline at end of file