diff --git a/kernel/drivers/module-nvidia-current/actions.py b/kernel/drivers/module-nvidia-current/actions.py
index 039211a9ca..24a1ebfa93 100644
--- a/kernel/drivers/module-nvidia-current/actions.py
+++ b/kernel/drivers/module-nvidia-current/actions.py
@@ -46,9 +46,8 @@ def build():
 
     autotools.make("module")
     
-    shelltools.cd("uvm")
-    
-    autotools.make("module")
+    #shelltools.cd("uvm")
+    #autotools.make("module")
 
 def install():
 
@@ -58,7 +57,7 @@ def install():
                           "kernel/nvidia.ko")
         
         pisitools.insinto("/lib/modules/%s/extra/nvidia" % KDIR,
-                          "kernel/uvm/nvidia-uvm.ko")
+                          "kernel/nvidia-uvm.ko")
         
 
         # Command line tools and their man pages
diff --git a/kernel/drivers/module-nvidia-current/pspec.xml b/kernel/drivers/module-nvidia-current/pspec.xml
index cf38dbfb58..fbc417c818 100644
--- a/kernel/drivers/module-nvidia-current/pspec.xml
+++ b/kernel/drivers/module-nvidia-current/pspec.xml
@@ -11,10 +11,10 @@
         <License>NVIDIA</License>
         <Summary>NVIDIA drivers for GeForce 6xxx and newer GPUs</Summary>
         <Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
-        <Archive sha1sum="d15907ed7527f3590407a340a2882e5a9600a81d" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/349.16/NVIDIA-Linux-x86-349.16.run</Archive>
-        <Archive sha1sum="7d842a02a672547996002c866418cde917d821a0" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86_64/349.16/NVIDIA-Linux-x86_64-349.16.run</Archive>
+        <Archive sha1sum="5e944003366c2ec701ba5e0faf897cc1fd0defbf" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/355.11/NVIDIA-Linux-x86-355.11.run</Archive>
+        <Archive sha1sum="7881eb598fbfd8f7b79dce998ae53f1ee37b0d44" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86_64/355.11/NVIDIA-Linux-x86_64-355.11.run</Archive>
         <BuildDependencies>
-            <Dependency version="4.0.5">kernel-module-headers</Dependency>
+            <Dependency version="4.1.8">kernel-module-headers</Dependency>
             <Dependency>libX11-devel</Dependency>
         </BuildDependencies>
     </Source>
@@ -24,7 +24,7 @@
         <IsA>driver</IsA>
         <Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
         <RuntimeDependencies>
-            <Dependency version="4.0.5">kernel</Dependency>
+            <Dependency version="4.1.8">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -89,6 +89,13 @@
     </Package>
 
     <History>
+        <Update release="45">
+            <Date>2015-09-23</Date>
+            <Version>355.11</Version>
+            <Comment>Version bump, for kernel 4.1.8</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
          <Update release="44">
             <Date>2015-06-16</Date>
             <Version>349.16</Version>