diff --git a/SysBuild/xserv/NVIDIA-Linux b/SysBuild/xserv/NVIDIA-Linux
index ead500c..3eae479 100644
--- a/SysBuild/xserv/NVIDIA-Linux
+++ b/SysBuild/xserv/NVIDIA-Linux
@@ -90,96 +90,101 @@ premk() {
 mk() {
 	DSTPKGNAME=`basename $DSTPKGNAME`
 	PKGNAME=$DSTPKGNAME.vpg
-	if [ ${MK64BIT} == "true" ]; then
-		mv usr/X11R6/lib usr/X11R6/lib64
-		mv usr/lib usr/lib64
-		mv usr/lib32 usr/lib
-	fi
-	mv usr/share/doc usr/share/nvidia
-	mkdir usr/share/doc
-	mv usr/share/nvidia usr/share/doc
-	mv nvidia-installer usr/bin
-	mv LICENSE usr/share/doc/nvidia
-	rm usr/bin/tls*
-	rm usr/bin/makeself.sh
-	rm usr/bin/mkprecompiled
-	mv usr/X11R6 usr/X11R7
-	mkdir usr/X11R7/include
-	mv usr/include/* usr/X11R7/include
-	cd usr/include
-	ln -s ../X11R7/include/cuda .
-	ln -s ../X11R7/include/GL .
-	ln -s ../X11R7/include/vdpau .
+	mkdir -p $TMPROOT/lib/modules/nvidia
+	tar -C kernel/ -cf - .|tar -C $TMPROOT/lib/modules/nvidia -xvf -
+	mkdir -p $TMPROOT/usr/X11R7/include/{GL,cuda,vdpau}
+	mv cuda*.h $TMPROOT/usr/X11R7/include/cuda/
+	mv vdpau*.h $TMPROOT/usr/X11R7/include/vdpau/
+	mv *.h $TMPROOT/usr/X11R7/include/GL/
+	mkdir -p $TMPROOT/usr/bin
+	mv nvidia-{settings,bug-report.sh,xconfig,installer,smi} $TMPROOT/usr/bin
+	mkdir -p $TMPROOT/etc/OpenCL/vendors
+	mv nvidia.icd $TMPROOT/etc/OpenCL/vendors
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/
+	mv tls $TMPROOT/usr/X11R7/$LIBDIR/
+	cd $TMPROOT/usr/X11R7/$LIBDIR/tls
+	ln -s libnvidia-tls* libnvidia-tls.so.1
 	cd -
-	tar -C usr/$LIBDIR -cf - .|tar -C usr/X11R7/$LIBDIR -xvf -
-	rm -r usr/$LIBDIR/*
-	find . -type f -exec sed -i "s/X11R6/X11R7/g" {} \;
-	cd usr/X11R7/$LIBDIR/tls
-	ln -s libnvidia-tls.so.* libnvidia-tls.so.1
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/xorg/modules/{drivers,extensions}
+	mv libnvidia-wfb.so.* $TMPROOT/usr/X11R7/$LIBDIR/xorg/modules/
+	mv nvidia_drv.so $TMPROOT/usr/X11R7/$LIBDIR/xorg/modules/drivers/
+	mv libglx.so.* $TMPROOT/usr/X11R7/$LIBDIR/xorg/modules/extensions/
+	cd $TMPROOT/usr/X11R7/$LIBDIR/xorg/modules/
+	ln -s libnvidia-wfb.so.???.* libnvidia-wfb.so.1
+	ln -s libnvidia-wfb.so.???.* libnvidia-wfb.so
 	cd -
-	cd usr/X11R7/$LIBDIR/vdpau
-	ln -sf libvdpau_nvidia.so.* libvdpau_nvidia.so.1
-	ln -sf libvdpau_nvidia.so.1 libvdpau_nvidia.so
-	ln -sf libvdpau_trace.so.* libvdpau_trace.so.1
-	ln -sf libvdpau_trace.so.l libvdpau_trace.so
-	cd -
-	cd usr/X11R7/$LIBDIR
-	ln -sf libcuda.so.* libcuda.so.1
-	ln -sf libcuda.so.1 libcuda.so
-	ln -sf libGLcore.so.* libGLcore.so.1
-	ln -sf libGLcore.so.1 libGLcore.so
-	ln -sf libGL.so.* libGL.so.1
-	ln -sf libGL.so.1 libGL.so
-	ln -sf libnvidia-cfg.so.* libnvidia-cfg.so.1
-	ln -sf libnvidia-cfg.so.1 libnvidia-cfg.so
-	ln -sf libnvidia-tls.so.* libnvidia-tls.so.1
-	ln -sf libnvidia-tls.so.1 libnvidia-tls.so
-	ln -sf libvdpau.so.* libvdpau.so.1
-	ln -sf libvdpau.so.1 libvdpau.so
-	ln -sf libXvMCNVIDIA.so.* libXvMCNVIDIA_dynamic.so.1
-	ln -sf libXvMCNVIDIA.so.1 libXvMCNVIDIA_dynamic.so
-	cd -
-	mkdir usr/X11R7/$LIBDIR/xorg
-	mv usr/X11R7/$LIBDIR/modules usr/X11R7/$LIBDIR/xorg
-	cd usr/X11R7/$LIBDIR/xorg/modules
-	#ln -s libnvidia-wfb.so.* libwfb.so.1
-	ln -s libnvidia-wfb.so.* libnvidia-wfb.so.1
-	ln -s libnvidia-wfb.so.1 libnvidia-wfb.so
-	cd -
-	cd usr/X11R7/$LIBDIR/xorg/modules/extensions
+	cd $TMPROOT/usr/X11R7/$LIBDIR/xorg/modules/extensions
 	ln -s libglx.so.* libglx.so
 	cd -
-	rm -r usr/$LIBDIR
-	mkdir -p lib/modules
-	mv usr/src/nv lib/modules/nvidia
-	rm -r usr/src
-	rm pkg-history.txt
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/vdpau
+	mv libvdpau_* $TMPROOT/usr/X11R7/$LIBDIR/vdpau
+	cd $TMPROOT/usr/X11R7/$LIBDIR/vdpau
+	ln -s libvdpau_nvidia.so.???.* libvdpau_nvidia.so.1
+	ln -s libvdpau_nvidia.so.???.* libvdpau_nvidia.so
+	ln -s libvdpau_trace.so.???.* libvdpau_trace.so.1
+	ln -s libvdpau_trace.so.???.* libvdpau_trace.so
+	cd -
+	mkdir -p $TMPROOT/usr/share/{applications,pixmaps,doc}
+	mv nvidia-settings.desktop $TMPROOT/usr/share/applications
+	mv nvidia-settings.png $TMPROOT/usr/share/pixmaps
+	mkdir $TMPROOT/usr/include
+	ln -s /usr/X11R7/include/GL $TMPROOT/usr/include/GL
+	ln -s /usr/X11R7/include/cuda $TMPROOT/usr/include/cuda
+	ln -s /usr/X11R7/include/vdpau $TMPROOT/usr/include/vdpau
+	mkdir -p $TMPROOT/usr/share/doc/nvidia
+	mv html $TMPROOT/usr/share/doc/nvidia
+	mv NVIDIA_Changelog LICENSE README.txt .manifest pkg-history.txt $TMPROOT/usr/share/doc/nvidia
+	mkdir -p $TMPROOT/usr/share/man/man1
+	mv *.1.gz $TMPROOT/usr/share/man/man1
+	mv lib* $TMPROOT/usr/X11R7/$LIBDIR
+	cd $TMPROOT/usr/X11R7/$LIBDIR
+	ln -s libcuda.so.???.* libcuda.so.1
+	ln -s libcuda.so.???.* libcuda.so
+	ln -s libGL.so.???.* libGL.so.1
+	ln -s libGL.so.???.* libGL.so
+	ln -s libnvidia-cfg.so.???.* libnvidia-cfg.so.1
+	ln -s libnvidia-cfg.so.???.* libnvidia-cfg.so
+	ln -s libnvidia-glcore.so.???.* libnvidia-glcore.so.1
+	ln -s libnvidia-glcore.so.???.* libnvidia-glcore.so
+	ln -s libnvidia-glcore.so.???.* libGLcore.so.1
+	ln -s libnvidia-glcore.so.???.* libGLcore.so
+	ln -s libnvidia-tls.so.???.* libnvidia-tls.so.1
+	ln -s libnvidia-tls.so.???.* libnvidia-tls.so
+	ln -s libvdpau.so.???.* libvdpau.so.1
+	ln -s libvdpau.so.???.* libvdpau.so
+	ln -s libXvMCNVIDIA.so.???.* libXvMCNVIDIA_dynamic.so.1
+	ln -s libXvMCNVIDIA.so.???.* libXvMCNVIDIA_dynamic.so
+	cd -
+
 	if [ ${MK64BIT} == "true" ]; then
-		mv usr/lib usr/X11R7/lib
-		cd usr/X11R7/lib/tls
-		ln -s libnvidia-tls.so.* libnvidia-tls.so.1
+		mkdir -p $TMPROOT/usr/X11R7/lib/vdpau
+		mv 32/libvdpau_* $TMPROOT/usr/X11R7/lib/vdpau
+		cd $TMPROOT/usr/X11R7/lib/vdpau
+		ln -s libvdpau_nvidia.so.???.* libvdpau_nvidia.so.1
+		ln -s libvdpau_nvidia.so.???.* libvdpau_nvidia.so
+		ln -s libvdpau_trace.so.???.* libvdpau_trace.so.1
+		ln -s libvdpau_trace.so.???.* libvdpau_trace.so
 		cd -
-		cd usr/X11R7/lib/vdpau
-		ln -sf libvdpau_nvidia.so.* libvdpau_nvidia.so.1
-		ln -sf libvdpau_nvidia.so.1 libvdpau_nvidia.so
-		ln -sf libvdpau_trace.so.* libvdpau_trace.so.1
-		ln -sf libvdpau_trace.so.l libvdpau_trace.so
+		mv 32/tls $TMPROOT/usr/X11R7/lib/
+		cd $TMPROOT/usr/X11R7/lib/tls
+		ln -s libnvidia-tls* libnvidia-tls.so.1
 		cd -
-		cd usr/X11R7/lib
-		ln -sf libcuda.so.* libcuda.so.1
-		ln -sf libcuda.so.1 libcuda.so
-		ln -sf libGLcore.so.* libGLcore.so.1
-		ln -sf libGLcore.so.1 libGLcore.so
-		ln -sf libGL.so.* libGL.so.1
-		ln -sf libGL.so.1 libGL.so
-		ln -sf libnvidia-tls.so.* libnvidia-tls.so.1
-		ln -sf libnvidia-tls.so.1 libnvidia-tls.so
-		ln -sf libvdpau.so.* libvdpau.so.1
-		ln -sf libvdpau.so.1 libvdpau.so
+		mv 32/vdpau $TMPROOT/usr/X11R7/lib
+		mv lib* $TMPROOT/usr/X11R7/lib
+		ln -s libcuda.so.???.* libcuda.so.1
+		ln -s libcuda.so.???.* libcuda.so
+		ln -s libGL.so.???.* libGL.so.1
+		ln -s libGL.so.???.* libGL.so
+		ln -s libnvidia-glcore.so.???.* libnvidia-glcore.so.1
+		ln -s libnvidia-glcore.so.???.* libnvidia-glcore.so
+		ln -s libnvidia-glcore.so.???.* libGLcore.so.1
+		ln -s libnvidia-glcore.so.???.* libGLcore.so
+		ln -s libnvidia-tls.so.???.* libnvidia-tls.so.1
+		ln -s libnvidia-tls.so.???.* libnvidia-tls.so
+		ln -s libvdpau.so.???.* libvdpau.so.1
+		ln -s libvdpau.so.???.* libvdpau.so
 		cd -
 	fi
-	mv .manifest usr/share/doc/nvidia
-	tar -cf - .|tar -C $TMPROOT -xvf -
 }
 
 postmk() {