diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta
index 368e774086..ad1717b6b7 100644
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libX11"
+PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11"
 PKG_BUILD_DEPENDS="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
diff --git a/packages/x11/lib/libXxf86vm/build b/packages/x11/lib/libXxf86vm/build
index 2bcf380df0..1d264cc37a 100755
--- a/packages/x11/lib/libXxf86vm/build
+++ b/packages/x11/lib/libXxf86vm/build
@@ -28,9 +28,9 @@ cd $PKG_BUILD
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
+            --enable-static \
+            --disable-shared \
             --enable-malloc0returnsnull
 
 make
-$MAKEINSTALL
\ No newline at end of file
+$MAKEINSTALL
diff --git a/packages/x11/lib/libXxf86vm/install b/packages/x11/lib/libXxf86vm/install
deleted file mode 100755
index 1c803b8c9a..0000000000
--- a/packages/x11/lib/libXxf86vm/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libXxf86vm.so* $INSTALL/usr/lib