diff --git a/package/xorg/mesalib/mesalib.conf b/package/xorg/mesalib/mesalib.conf
index 6cfcfa4f4..a819dbc4d 100644
--- a/package/xorg/mesalib/mesalib.conf
+++ b/package/xorg/mesalib/mesalib.conf
@@ -21,15 +21,10 @@ mesalib_postmake() {
 	done
 }
 
-# var_append CC_WRAPPER_FILTER "|" \
-# 	"sed -r 's,-lglut,-L/usr/X11/lib\n-lXmu\n-lXi\n-lglut,g'"
-
 if [ "$xpkg" = mesalib -o "$xpkg" = mesademos ] ; then
 	prepatch="mesalib_prepatch"
 	postmake="mesalib_postmake"
-fi
 
-if [ "$xpkg" = mesalib ] ; then
 	case "$arch" in
 	ppc)
 		makeopt="linux-dri-$arch_target"
@@ -47,4 +42,8 @@ if [ "$xpkg" = mesalib ] ; then
 	esac
 fi
 
+if [ "$xpkg" = mesademos ] ; then
+	makeinstopt=""
+fi
+
 export CFLAGS="$CFLAGS -I/usr/X11/include"
diff --git a/package/xorg/mesalib/mesalib.desc b/package/xorg/mesalib/mesalib.desc
index 98c99be18..778ba0044 100644
--- a/package/xorg/mesalib/mesalib.desc
+++ b/package/xorg/mesalib/mesalib.desc
@@ -44,17 +44,13 @@
 [V] 7.0.2
 [P] X -----5---9 120.400
 
-#if xpkg == mesalib
+#if xpkg == mesaglut
+[I] GL utility toolkit for the Mesa 3D graphics library
+[D] 3111933804 MesaGLUT-7.0.2.tar.bz2 http://dl.sourceforge.net/mesa3d/
+#endif
+
 [I] The Mesa 3D graphics library
 [D] 1731567489 MesaLib-7.0.2.tar.bz2 http://dl.sourceforge.net/mesa3d/
-#endif
 
-#if xpkg == mesademos
 [I] demos for the Mesa 3D graphics library
 [D] 2378135167 MesaDemos-7.0.2.tar.bz2 http://dl.sourceforge.net/mesa3d/
-#endif
-
-#if xpkg == mesaglut
-[I] GL utility toolkit for the Mesa 3D graphics library
-[D] 3111933804 MesaGLUT-7.0.2.tar.bz2 http://dl.sourceforge.net/mesa3d/
-#endif
diff --git a/package/xorg/xinit/xinit.desc b/package/xorg/xinit/xinit.desc
index a3ea325b4..196be3af7 100644
--- a/package/xorg/xinit/xinit.desc
+++ b/package/xorg/xinit/xinit.desc
@@ -36,8 +36,8 @@
 
 [L] OpenSource
 [S] Stable
-[V] 1.0.5
+[V] 1.0.7
 [P] X -----5---9 125.800
 
-[D] 3717313795 xinit-1.0.5.tar.bz2 ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.3/src/app/
+[D] 1885286351 xinit-1.0.7.tar.bz2 http://xorg.freedesktop.org/archive/individual/app/