diff --git a/config/options b/config/options
index 083a25f6bb..be1b169e2e 100644
--- a/config/options
+++ b/config/options
@@ -91,10 +91,10 @@ RECEIVER=atiusb
 EXTRAFIRMWARES=no
 
 # Support for emulators (yes/no)
-EMULATORS=yes
+EMULATORS=no
 
 # Support for games (yes/no)
-GAMES=yes
+GAMES=no
 
 # Network Support (Samba shares and FTP Server) (yes/no)
 NETWORK=yes
diff --git a/packages/graphics/Mesa/patches/25_mesa-7.1-link-shared.diff b/packages/graphics/Mesa/25_mesa-7.1-link-shared.diff
similarity index 97%
rename from packages/graphics/Mesa/patches/25_mesa-7.1-link-shared.diff
rename to packages/graphics/Mesa/25_mesa-7.1-link-shared.diff
index f04238311a..4898adaf2d 100644
--- a/packages/graphics/Mesa/patches/25_mesa-7.1-link-shared.diff
+++ b/packages/graphics/Mesa/25_mesa-7.1-link-shared.diff
@@ -13,7 +13,7 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m
  	-mkdir $(TOP)/$(LIB_DIR)
  
 +libdricore.so:
-+	gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
++	$(CC) -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
 +
 +$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
 +	$(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) 
diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index ba96e2d368..c278222178 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -48,6 +48,8 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
 
 make
 
+make -C progs/xdemos
+
 ## copy GLX headers for xorg-server to build
 #cp -PR include/* $LIB_PREFIX/include
 
diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install
index bced42afcb..52a2d307c6 100755
--- a/packages/graphics/Mesa/install
+++ b/packages/graphics/Mesa/install
@@ -11,11 +11,11 @@ $SCRIPTS/install libXxf86vm
 $SCRIPTS/install libX11
 
 mkdir -p $INSTALL/usr/lib
-#cp -PR $PKG_BUILD/src/mesa/libmesa.so* $INSTALL/usr/lib
-#cp -PR $PKG_BUILD/src/mesa/libglapi.so* $INSTALL/usr/lib
 cp -PR $PKG_BUILD/lib/libGL.so* $INSTALL/usr/lib
-cp -PR $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
-#cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
+#cp -PR $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dri
-cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri
+cp -PR $PKG_BUILD/lib/uni*_dri.so $INSTALL/usr/lib/dri
+
+mkdir -p $INSTALL/usr/bin
+cp -PR $PKG_BUILD/progs/xdemos/{corender,glsync,glthreads,glxcontexts,glxdemo,glxgears,glxgears_fbconfig,glxgears_pixmap,glxheads,glxinfo,glxpbdemo,glxpixmap,glxsnoop,glxswapcontrol,manywin,offset,overlay,pbdemo,pbinfo,sharedtex,sharedtex_mt,texture_from_pixmap,wincopy,xfont,xrotfontdemo} $INSTALL/usr/bin
diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url
index c2431178be..0d2971616a 100644
--- a/packages/graphics/Mesa/url
+++ b/packages/graphics/Mesa/url
@@ -1 +1,2 @@
-http://www.mesa3d.org/beta/MesaLib-7.5-rc2.tar.gz
\ No newline at end of file
+http://www.mesa3d.org/beta/MesaLib-7.5-rc2.tar.gz
+http://mesa3d.org/beta/MesaDemos-7.5-rc2.tar.gz
\ No newline at end of file
diff --git a/packages/multimedia/pigment/url b/packages/multimedia/pigment/url
index da388a73b7..b6e169969c 100644
--- a/packages/multimedia/pigment/url
+++ b/packages/multimedia/pigment/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/pigment-svn-1459.tar.bz2
+http://sources.openelec.tv/svn/pigment-svn-1466.tar.bz2
diff --git a/packages/python/multimedia/pigment-python/url b/packages/python/multimedia/pigment-python/url
index 7757ab3907..3c6d479b97 100644
--- a/packages/python/multimedia/pigment-python/url
+++ b/packages/python/multimedia/pigment-python/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/pigment-python-svn-1459.tar.bz2
+http://sources.openelec.tv/svn/pigment-python-svn-1466.tar.bz2