diff --git a/srcpkgs/glxinfo b/srcpkgs/glxinfo
new file mode 120000
index 00000000000..45d9c37a7dc
--- /dev/null
+++ b/srcpkgs/glxinfo
@@ -0,0 +1 @@
+mesa-demos
\ No newline at end of file
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index ddf19894378..dfa93a9d1fc 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=mesa-demos
 version=8.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXext-devel MesaLib-devel glu-devel glew-devel freetype-devel"
@@ -18,8 +18,16 @@ 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."
 
-mesa-demos_package() {
+glxinfo_package() {
+	short_desc="Tool to diagnose problems with 3D acceleration setup"
+	replaces="mesa-demos<8.1.0_2"
 	pkg_install() {
-		vmove usr
+		vmove usr/bin/glxinfo
+	}
+}
+
+mesa-demos_package() {
+	pkg_install() {
+		vmove all
 	}
 }