diff --git a/kernel/drivers/module-nvidia304/actions.py b/kernel/drivers/module-nvidia304/actions.py
index 043480d88d..3d00e24a22 100644
--- a/kernel/drivers/module-nvidia304/actions.py
+++ b/kernel/drivers/module-nvidia304/actions.py
@@ -31,7 +31,7 @@ def setup():
                       % (arch, get.srcVERSION()))
     shelltools.move("tmp/*", ".")
     
-    shelltools.system("patch -p1 < NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch")
+    #shelltools.system("patch -p0 < nv-drm.patch")
 
     # Our libc is TLS enabled so use TLS library
     shelltools.unlink("*-tls.so*")
diff --git a/kernel/drivers/module-nvidia304/files/nv-drm.patch b/kernel/drivers/module-nvidia304/files/nv-drm.patch
new file mode 100644
index 0000000000..4c6a393c43
--- /dev/null
+++ b/kernel/drivers/module-nvidia304/files/nv-drm.patch
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include <drm/drmP.h>
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
++++ kernel/nv-drm.c
+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+
++    .set_busid = drm_pci_set_busid,
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",
diff --git a/kernel/drivers/module-nvidia304/pspec.xml b/kernel/drivers/module-nvidia304/pspec.xml
index 19b8a467c6..7907fa15fe 100644
--- a/kernel/drivers/module-nvidia304/pspec.xml
+++ b/kernel/drivers/module-nvidia304/pspec.xml
@@ -15,10 +15,10 @@
 <!--         <Archive sha1sum="1084a0a362aeb208e44afd28f0e27f7e2d352e24" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/304.119/NVIDIA-Linux-x86-304.119.run</Archive> -->
         <Archive sha1sum="45f292f7612dcafac46332a4d884e866871cb6d2" type="binary">http://download.nvidia.com/XFree86/Linux-x86_64/304.125/NVIDIA-Linux-x86_64-304.125.run</Archive>
         <AdditionalFiles>
-	  <AdditionalFile target="NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch">NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch</AdditionalFile>
+            <AdditionalFile target="nv-drm.patch">nv-drm.patch</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
-            <Dependency version="3.19.8">kernel-module-headers</Dependency>
+            <Dependency version="4.1.8">kernel-module-headers</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -26,7 +26,7 @@
         <Name>module-nvidia304</Name>
         <Summary>Kernel module for NVIDIA driver 304.xx releases</Summary>
         <RuntimeDependencies>
-            <Dependency version="3.19.8">kernel</Dependency>
+            <Dependency version="4.1.8">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -63,6 +63,13 @@
     </Package>
 
     <History>
+      <Update release="39">
+            <Date>2015-09-23</Date>
+            <Version>304.125</Version>
+            <Comment>version bump for kernel 4.1.8</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+      </Update>
       <Update release="38">
             <Date>2015-05-22</Date>
             <Version>304.125</Version>
@@ -70,21 +77,21 @@
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
       </Update>
-        <Update release="37">
+      <Update release="37">
             <Date>2015-05-05</Date>
             <Version>304.125</Version>
             <Comment>Rebuild for kernel 3.19.6</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
       </Update>
-       <Update release="36">
+      <Update release="36">
             <Date>2015-04-24</Date>
             <Version>304.125</Version>
             <Comment>Rebuild for kernel 3.19.5</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
       </Update>
-       <Update release="35">
+      <Update release="35">
             <Date>2015-04-16</Date>
             <Version>304.125</Version>
             <Comment>Rebuild for kernel 3.19.4</Comment>
diff --git a/kernel/drivers/module-nvidia340/files/nv-drm.patch b/kernel/drivers/module-nvidia340/files/nv-drm.patch
new file mode 100644
index 0000000000..4c6a393c43
--- /dev/null
+++ b/kernel/drivers/module-nvidia340/files/nv-drm.patch
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include <drm/drmP.h>
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
++++ kernel/nv-drm.c
+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+
++    .set_busid = drm_pci_set_busid,
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",
diff --git a/kernel/drivers/module-nvidia340/pspec.xml b/kernel/drivers/module-nvidia340/pspec.xml
index f44312f8d7..b2824e9855 100644
--- a/kernel/drivers/module-nvidia340/pspec.xml
+++ b/kernel/drivers/module-nvidia340/pspec.xml
@@ -14,7 +14,7 @@
         <Archive sha1sum="1335af174324f5c752388110e65c3c51beea729b" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run</Archive>
         <Archive sha1sum="369554b46b43f082a38c6fcce096265a66e97483" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76.run</Archive>
         <BuildDependencies>
-            <Dependency version="3.19.8">kernel-module-headers</Dependency>
+            <Dependency version="4.1.8">kernel-module-headers</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -23,7 +23,7 @@
         <IsA>driver</IsA>
         <Summary>Kernel module for NVIDIA driver 340.xx releases</Summary>
         <RuntimeDependencies>
-            <Dependency version="3.19.8">kernel</Dependency>
+            <Dependency version="4.1.8">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -95,7 +95,14 @@
     </Package>
 
     <History>
-       <Update release="10">
+      <Update release="11">
+            <Date>2015-09-23</Date>
+            <Version>340.76</Version>
+            <Comment>Version bump, for kernel 3.19.8</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+      </Update>
+      <Update release="10">
             <Date>2015-05-22</Date>
             <Version>340.76</Version>
             <Comment>Rebuild for kernel 3.19.8</Comment>