diff --git a/packages/x11/driver/xf86-video-nvidia/build b/packages/x11/driver/xf86-video-nvidia/build
index 02bf15ff30..d932a9faea 100755
--- a/packages/x11/driver/xf86-video-nvidia/build
+++ b/packages/x11/driver/xf86-video-nvidia/build
@@ -5,5 +5,5 @@
 $SCRIPTS/build toolchain
 $SCRIPTS/build linux
 
-cd $BUILD/$1/usr/src/nv
+cd $BUILD/$1/kernel
   make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path)
diff --git a/packages/x11/driver/xf86-video-nvidia/install b/packages/x11/driver/xf86-video-nvidia/install
index b1b5dd126d..e1769764f5 100755
--- a/packages/x11/driver/xf86-video-nvidia/install
+++ b/packages/x11/driver/xf86-video-nvidia/install
@@ -9,21 +9,23 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
 VER=`ls $BUILD/linux*/modules/lib/modules`
 
 mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
-  cp -P $BUILD/$1/usr/X11R6/lib/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
+  cp -P $BUILD/$1/nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
 
 mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions
-  cp -P $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
+# rename to not conflicting with Mesa libGL.so
+  cp -P $BUILD/$1/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
 
 mkdir -p $INSTALL/etc/X11
-  cp -P $PKG_DIR/config/*.conf $INSTALL/etc/X11
+  cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
 
 mkdir -p $INSTALL/usr/lib
-  cp -P $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1
-  cp -P $BUILD/$1/usr/lib/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1
-  cp -P $BUILD/$1/usr/lib/tls/*tls*.so* $INSTALL/usr/lib/libnvidia-tls.so.1
+  cp -P $BUILD/$1/libnvidia-glcore.so* $INSTALL/usr/lib
+  cp -P $BUILD/$1/tls/libnvidia-tls.so* $INSTALL/usr/lib
+# rename to not conflicting with Mesa libGL.so
+  cp -P $BUILD/$1/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1
 
 mkdir -p $INSTALL/lib/modules/$VER/nvidia
-  cp -P $BUILD/$1/usr/src/nv/nvidia.ko $INSTALL/lib/modules/$VER/nvidia
+  cp $BUILD/$1/kernel/nvidia.ko $INSTALL/lib/modules/$VER/nvidia
 
   for MOD in `find $INSTALL/lib/modules/$VER/nvidia -name *.ko`; do
     $STRIP --strip-debug $MOD
@@ -37,6 +39,6 @@ mkdir -p $INSTALL/lib/modules/$VER/nvidia
 if [ "$VDPAU" = yes ]; then
   $SCRIPTS/install libvdpau
 
-  cp $BUILD/$1/usr/lib/vdpau/libvdpau_nvidia.so* $INSTALL/usr/lib/libvdpau_nvidia.so.1
+  cp $BUILD/$1/libvdpau_nvidia.so* $INSTALL/usr/lib/libvdpau_nvidia.so.1
   ln -sf libvdpau_nvidia.so.1 $INSTALL/usr/lib/libvdpau_nvidia.so
 fi
diff --git a/packages/x11/driver/xf86-video-nvidia/url b/packages/x11/driver/xf86-video-nvidia/url
index d4bc0525fd..cd152909e2 100644
--- a/packages/x11/driver/xf86-video-nvidia/url
+++ b/packages/x11/driver/xf86-video-nvidia/url
@@ -1,2 +1,2 @@
-ftp://download.nvidia.com/XFree86/Linux-x86/195.36.31/NVIDIA-Linux-x86-195.36.31-pkg0.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.31/NVIDIA-Linux-x86_64-195.36.31-pkg0.run
+ftp://download.nvidia.com/XFree86/Linux-x86/256.35/NVIDIA-Linux-x86-256.35.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/256.35/NVIDIA-Linux-x86_64-256.35-no-compat32.run
\ No newline at end of file