diff --git a/srcpkgs/MesaLib/glx-utils.template b/srcpkgs/MesaLib/glx-utils.template
new file mode 100644
index 00000000000..d776c347468
--- /dev/null
+++ b/srcpkgs/MesaLib/glx-utils.template
@@ -0,0 +1,16 @@
+# Template file for 'glx-utils'.
+#
+short_desc="GLX utilities from Mesa"
+long_desc="${long_desc}
+
+ This package contains some GLX utilities such as glxgears and glxinfo."
+
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run MesaLib
+
+do_install()
+{
+	install -d ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+}
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index d52b129feaf..65434a07d4d 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,13 +1,18 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=7.7
-wrksrc="Mesa-$version"
-distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
+revision=1
+wrksrc="Mesa-${version}"
+distfiles="
+ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2
+ftp://ftp.freedesktop.org/pub/mesa/$version/MesaDemos-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--enable-glx-tls --enable-xcb"
+configure_args="--enable-glx-tls --enable-xcb --with-demos"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a
+checksum="
+6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a
+38dbcce59fcc457b53ff6d4e2d5a400d41c02f093bb1fae141e99e032729ab14"
 long_desc="
  MesaLib is a 3-D graphics library with an API which is very similar to
  that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax
@@ -15,7 +20,7 @@ long_desc="
  Inc. However, the author makes no claim that Mesa is in any way a
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
 
-subpackages="$pkgname-devel"
+subpackages="$pkgname-devel glx-utils"
 Add_dependency build pkg-config
 Add_dependency build glproto
 Add_dependency build dri2proto	">=2.1"
@@ -32,3 +37,12 @@ Add_dependency full libXfixes
 Add_dependency full libXdamage
 Add_dependency full libXxf86vm
 Add_dependency run  libstdc++
+
+post_install()
+{
+	install -d ${DESTDIR}/usr/bin || return 1
+	for f in glxgears glxinfo; do
+		install -m755 ${wrksrc}/progs/xdemos/${f} \
+			${DESTDIR}/usr/bin || return 1
+	done
+}
diff --git a/srcpkgs/glx-utils b/srcpkgs/glx-utils
new file mode 120000
index 00000000000..8bf5fbea217
--- /dev/null
+++ b/srcpkgs/glx-utils
@@ -0,0 +1 @@
+MesaLib
\ No newline at end of file