diff --git a/.gitignore b/.gitignore
index 5c678c0..912741b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.24-pkg0.run
-NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+NVIDIA-Linux-x86-195.36.31-pkg0.run
+NVIDIA-Linux-x86_64-195.36.31-pkg0.run
diff --git a/nvidia-config-display b/nvidia-config-display
index 5417cbd..b71b3d1 100755
--- a/nvidia-config-display
+++ b/nvidia-config-display
@@ -76,8 +76,8 @@ class nvidiaConfigDisplay(GlxConfig):
                     break
                 else:
                     self.addModule(module)
-        # Problems with Compiz without these.
-        self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+        # Problems with Compiz without these. - not needed since 195.xxx
+        #self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
         #self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
         Utils.writeXorgConf(self.xconfig, self.xconfigpath)
         # We have to read saved status file to restore the Xorg configuration. 
@@ -94,9 +94,9 @@ class nvidiaConfigDisplay(GlxConfig):
         prevDriver = self.config.getOldDriver()
         if prevDriver == self.majorVendor:
             print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
-            print _('Using the \'nv\' driver instead.')
-            prevDriver = "nv"
-            self.config.setOldDriver("nv")
+            print _('Using the \'nouveau\' driver instead.')
+            prevDriver = "nouveau"
+            self.config.setOldDriver("nouveau")
         self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
         self.removeOption(self.majorVendor,"DisableGLXRootClipping")
         self.toggleDriver(self.majorVendor, prevDriver)
diff --git a/sources b/sources
index a9ac2b2..2d13709 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-97d3e5f69707092aa643fb901bb94003  NVIDIA-Linux-x86-195.36.24-pkg0.run
-9d58114ed8c89cd66fbaccad0c997ee8  NVIDIA-Linux-x86_64-195.36.24-pkg0.run
+c30af5d776e3c71c6dd8e06c30e4bf1f  NVIDIA-Linux-x86-195.36.31-pkg0.run
+91cd7502cb6ca3a5c0e79e33ae79881f  NVIDIA-Linux-x86_64-195.36.31-pkg0.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 66398a9..76481f4 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -8,7 +8,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
-Version:         195.36.24
+Version:         195.36.31
 Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
@@ -254,8 +254,8 @@ install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
 # Change perms on static libs. Can't fathom how to do it nicely above.
 find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
 
-# Remove execstack needs on F-12 and laters
-%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+# Remove execstack needs on F-12 and laters - disabled
+%if 0
 find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
 execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
 execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -272,8 +272,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-# Removes old legacy layout, fixed SELinux copy errors
-if [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||:
 if [ "$1" -eq "1" ]; then
   # Enable nvidia driver when installing
   %{_sbindir}/nvidia-config-display enable &>/dev/null ||:
@@ -281,6 +279,16 @@ if [ "$1" -eq "1" ]; then
   /sbin/chkconfig --add nvidia ||:
   /etc/init.d/nvidia start &>/dev/null ||:
 fi
+if [ -x /sbin/grubby ] ; then
+  GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+  /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null
+fi
+if [ -x /usr/sbin/setsebool ] ; then
+  SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l`
+  if [ ${SELINUXEXECSTACK} -eq "1" ] ; then
+    /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+  fi
+fi ||:
 
 %post libs -p /sbin/ldconfig
 
@@ -351,6 +359,13 @@ fi ||:
 
 
 %changelog
+* Wed Jun 16 2010 Nicolas Chauvet <kwizart@gmail.com> - 1:195.36.31-1
+- Update to 195.36.31
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+- Fallback to nouveau instead of nv
+- AddARGBGLXVisuals is enabled by default since 195xx serie.
+
 * Sat Apr 24 2010 Nicolas Chauvet <kwizart@fedoraproject.org> - 1:195.36.24-1
 - Update to 195.36.24