diff --git a/x11/nvidia/install/etc_X11_xorg-nvidia.conf.txt b/x11/nvidia/install/etc_X11_xorg-nvidia.conf.txt
new file mode 100644
index 000000000..5b6f23d1e
--- /dev/null
+++ b/x11/nvidia/install/etc_X11_xorg-nvidia.conf.txt
@@ -0,0 +1,43 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../nvidia/install/etc_X11_xorg-nvidia.conf.txt
+# Copyright (C) 2012 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# 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; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+Section "Device"
+    Identifier     "nvidia"
+    Driver         "nvidia"
+    Option         "DynamicTwinView" "False"
+    Option         "NoFlip" "false"
+    Option         "NoLogo" "true"
+    Option         "ConnectToAcpid" "0"
+    Option         "FlatPanelProperties" "Scaling = Native"
+    Option         "ModeValidation" "NoVesaModes, NoXServerModes"
+    Option         "HWCursor" "false"
+EndSection
+
+Section "Screen"
+    Identifier     "screen"
+    Device         "nvidia"
+    DefaultDepth    24
+    Option         "ColorRange" "Full"
+#    Option         "ColorRange" "Limited"
+#    Option         "ColorSpace" "RGB"
+#    Option         "ColorSpace" "YCbCr444"
+    SubSection     "Display"
+        Depth       24
+    EndSubSection
+EndSection
+
+Section "Extensions"
+    Option         "Composite" "false"
+EndSection
+
diff --git a/x11/nvidia/module-install-26.patch b/x11/nvidia/module-install-26.patch
index b72d9abb5..06521f162 100644
--- a/x11/nvidia/module-install-26.patch
+++ b/x11/nvidia/module-install-26.patch
@@ -1,22 +1,36 @@
-diff -ruN NVIDIA-Linux-x86-100.14.19-pkg1.orig/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86-100.14.19-pkg1/usr/src/nv/Makefile.kbuild
---- NVIDIA-Linux-x86-100.14.19-pkg1.orig/usr/src/nv/Makefile.kbuild	2007-09-12 23:49:01.000000000 +0200
-+++ NVIDIA-Linux-x86-100.14.19-pkg1/usr/src/nv/Makefile.kbuild	2007-09-22 20:33:07.000000000 +0200
-@@ -334,7 +334,8 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../nvidia/module-install-26.patch
+# Copyright (C) 2012 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- kernel/Makefile.kbuild.orig	2012-03-17 22:55:51.000000000 +0100
++++ kernel/Makefile.kbuild	2012-04-10 23:54:38.063139448 +0200
+@@ -257,8 +257,7 @@
+ 
  module-install: suser-sanity-check module
  	@mkdir -p $(MODULE_ROOT)/video; \
- 	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
+-	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
 -	PATH="$(PATH):/bin:/sbin" depmod -ae;
-+	echo "$(MODULE_OBJECT) installed successfully.";
-+#	PATH="$(PATH):/bin:/sbin" depmod -ae;
++	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video;
  
  #
  # This target builds, then installs, then creates device nodes and inserts
-@@ -342,7 +343,7 @@
+@@ -266,7 +265,6 @@
  #
  
  package-install: module-install rmmod-sanity-check
--	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
-+#	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && 
+-	@PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
  	echo "$(MODULE_OBJECT) installed successfully.";
  
  #
diff --git a/x11/nvidia/nvidia.conf b/x11/nvidia/nvidia.conf
index 748f2c3af..d78041110 100644
--- a/x11/nvidia/nvidia.conf
+++ b/x11/nvidia/nvidia.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../nvidia/nvidia.conf
-# Copyright (C) 2007 - 2008 The OpenSDE Project
+# Copyright (C) 2007 - 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -23,20 +23,47 @@ main() {
 	[ "$f" ] || abort "No binary for this architecture detected!"
 
 	sh $f --extract-only
-	cd N*-Linux-*-pkg*
+	cd N*-Linux-*
+
+	patch -p0 < $base/package/x11/nvidia/module-install-26.patch
 
-	apply_patchfiles
 
 	# install the X driver and extensions that do not conflict ...
-	mv -fv usr/X11R6/lib/libXvMCNVIDIA* $root/usr/X11/${libdir##*/}/
-	mv -fv usr/X11R6/lib/modules/drivers/* $root/usr/X11/${libdir##*/}/xorg/modules/drivers/
-	mv -fv usr/X11R6/lib/modules/extensions/* $root/usr/X11/${libdir##*/}/xorg/modules/extensions/
-
-	# copy the "shared" files the user might later munge into the system ...
-	cd usr
-	mkdir -p $root/$prefix/src/nvidia
-	cp -arv X11R6 include lib $root/$prefix/src/nvidia/
-	cp -arv share/doc/* $docdir/
+	mv -fv libXvMCNVIDIA* $root/usr/X11/${libdir##*/}/
+	mv -fv libvdpau* $root/usr/X11/${libdir##*/}/
+	mv -fv nvidia_drv.so $root/usr/X11/${libdir##*/}/xorg/modules/drivers/
+	mv -fv libglx.so* $root/usr/X11/${libdir##*/}/xorg/modules/extensions/libglx_nvidia.so
+	mkdir -p $root/usr/${libdir##*/}
+
+	mv -fv libnvidia-glcore.so* $root/usr/${libdir##*/}
+	mv -fv libnvidia-compiler.so* $root/usr/${libdir##*/}
+	mv -fv libcuda.so* $root/usr/${libdir##*/}
+	mv -fv libnvcuvid.so* $root/usr/${libdir##*/}
+	mv -fv libnvidia-ml.so* $root/usr/${libdir##*/}
+	mv -fv libnvidia-cfg.so* $root/usr/${libdir##*/}
+	mv -fv tls/libnvidia-tls.so* $root/usr/${libdir##*/}
+	mv -fv libGL.so* $root/usr/${libdir##*/}/libGL_nvidia.so.1
+
+	mkdir -p $root/usr/bin
+	mv -fv nvidia-smi $root/usr/bin/
+	mv -fv nvidia-xconfig $root/usr/bin/
+	mv -fv nvidia-settings $root/usr/bin/
+	
+	# Fancyness
+	mkdir -p $root/etc/OpenCL/vendors
+	mv -fv nvidia.icd $root/etc/OpenCL/vendors/
+	mkdir -p $root/usr/share/man/man1
+	mv -fv nvidia-settings.1.gz $root/usr/share/man/man1/
+	mv -fv nvidia-xconfig.1.gz $root/usr/share/man/man1/
+
+	mkdir -p $root/usr/share/applications
+	mkdir -p $root/usr/share/pixmaps
+	sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "nvidia-settings.desktop"
+        mv -fv nvidia-settings.desktop $root/usr/share/applications/
+	mv -fv nvidia-settings.png $root/usr/share/pixmaps
+	
+	
+ 
 }
 
 autoextract=0
diff --git a/x11/nvidia/nvidia.desc b/x11/nvidia/nvidia.desc
index 1033e4e6d..75a15a319 100644
--- a/x11/nvidia/nvidia.desc
+++ b/x11/nvidia/nvidia.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../nvidia/nvidia.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -33,9 +33,9 @@
 
 [L] Free-to-use
 [S] Stable
-[V] 100.14.19
+[V] 295.33
 [P] X -----5---9 131.300
 
-[D] 2399878693 NVIDIA-Linux-x86_64-100.14.19-pkg2.run http://us.download.nvidia.com/XFree86/Linux-x86_64/100.14.19/
-[D] 2175572652 NVIDIA-Linux-x86-100.14.19-pkg1.run http://us.download.nvidia.com/XFree86/Linux-x86/100.14.19/
+[D] 2544187557 NVIDIA-Linux-x86_64-295.33.run http://us.download.nvidia.com/XFree86/Linux-x86_64/295.33/
+[D] 179419429 NVIDIA-Linux-x86-295.33.run http://us.download.nvidia.com/XFree86/Linux-x86/295.33/
 [D] 3170993828 NVIDIA-Linux-ia64-1.0-5336-pkg1.run ftp://download.nvidia.com/XFree86/Linux-ia64/1.0-5336/
diff --git a/x11/nvidia/postlinux.conf b/x11/nvidia/postlinux.conf
index c82d895ff..1da685a23 100644
--- a/x11/nvidia/postlinux.conf
+++ b/x11/nvidia/postlinux.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../nvidia/postlinux.conf
-# Copyright (C) 2008 The OpenSDE Project
+# Copyright (C) 2008 - 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -25,11 +25,11 @@ nvidia_main() {
 	[ "$f" ] || abort "No binary for this architecture detected!"
 
 	sh $f --extract-only
-	cd N*-Linux-*-pkg*
+	cd N*-Linux-*
 
-	apply_patchfiles
+	patch -p0 < $base/package/x11/nvidia/module-install-26.patch
 
-	cd usr/src/nv
+	cd kernel
 	var_append makeopt " " "CC=$KCC"
 
 	var_append makeopt " " "SYSSRC=$kerneldir KERNEL_MODLIB=$moduledir"
@@ -38,13 +38,8 @@ nvidia_main() {
 
 	echo $MAKE $makeopt module
 	eval $MAKE $makeopt module
-	if [[ $treever = 24* ]] ; then
-		echo $MAKE $makeopt package-install
-		eval $MAKE $makeopt package-install
-	else
-		echo $MAKE $makeopt module-install
-		eval $MAKE $makeopt module-install
-	fi
+	echo $MAKE $makeopt module-install
+	eval $MAKE $makeopt module-install
 }
 
 autoextract=0