diff --git a/packages/debug/install b/packages/debug/install
index 06e5ebea75..a17bd11732 100755
--- a/packages/debug/install
+++ b/packages/debug/install
@@ -4,3 +4,5 @@
 
 $SCRIPTS/install strace
 $SCRIPTS/install gdb
+$SCRIPTS/install mesa-demos
+
diff --git a/packages/debug/mesa-demos/build b/packages/debug/mesa-demos/build
new file mode 100755
index 0000000000..d73a53f2f1
--- /dev/null
+++ b/packages/debug/mesa-demos/build
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build libX11
+$SCRIPTS/build Mesa
+$SCRIPTS/build glew
+
+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
new file mode 100755
index 0000000000..d75b56f0b8
--- /dev/null
+++ b/packages/debug/mesa-demos/install
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+. config/options
+
+$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
+  cp $PKG_BUILD/src/xdemos/glxinfo $INSTALL/usr/bin
diff --git a/packages/debug/mesa-demos/url b/packages/debug/mesa-demos/url
new file mode 100644
index 0000000000..a4475f5458
--- /dev/null
+++ b/packages/debug/mesa-demos/url
@@ -0,0 +1 @@
+ftp://ftp.freedesktop.org/pub/mesa/demos/8.0.1/mesa-demos-8.0.1.tar.bz2
\ No newline at end of file