diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install
index c6bbe2110b..4b895ea495 100755
--- a/packages/x11/driver/xf86-video-nvidia/install
+++ b/packages/x11/driver/xf86-video-nvidia/install
@@ -3,8 +3,7 @@
 . config/options
 
 $SCRIPTS/install linux
-
-require_eglibc $1
+$SCRIPTS/install libXinerama
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 VER=`ls $BUILD/linux*/modules/lib/modules`
diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 8a7d8249e1..0268b3aab0 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -4,6 +4,8 @@
 
 XORG_SRC="$PKG_BUILD/hw/xfree86"
 
+get_graphicdrivers
+
 $SCRIPTS/build toolchain
 
 $SCRIPTS/build xf86driproto
@@ -29,7 +31,7 @@ $SCRIPTS/build fontsproto
 $SCRIPTS/build xf86bigfontproto
 $SCRIPTS/build udev
 
-if test "$XINERAMA_SUPPORT" = "yes" ; then
+if [ "$XINERAMA_SUPPORT" = "yes" ]; then
   $SCRIPTS/build libXinerama
   XORG_XINERAMA="--enable-xinerama"
 else
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index a781274106..7a8dab605c 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -2,6 +2,8 @@
 
 . config/options
 
+get_graphicdrivers
+
 $SCRIPTS/install libpciaccess
 $SCRIPTS/install freetype
 $SCRIPTS/install openssl
@@ -70,8 +72,6 @@ mkdir -p $INSTALL/etc/X11/xorg.conf.d
   $SCRIPTS/install xf86-input-synaptics
   $SCRIPTS/install xf86-input-wacom
 
-get_graphicdrivers
-
   for drv in $XORG_DRIVERS; do
     $SCRIPTS/install xf86-video-$drv
   done