diff --git a/srcpkgs/nvidia304/files/linux-3.7.patch b/srcpkgs/nvidia304/files/linux-3.7.patch
deleted file mode 100644
index 5c5b9ee9423..00000000000
--- a/srcpkgs/nvidia304/files/linux-3.7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-the nvidia drivers are trying to test for version 2.6.6, but fail to take into
-account the first digit.  so 3.7.0+ ends up failing the test.
-
-https://bugs.gentoo.org/447566
-
---- kernel/conftest.sh	2013-02-04 15:10:20.669633666 -0500
-+++ kernel/conftest.sh	2013-02-04 15:10:34.283334673 -0500
-@@ -1697,13 +1697,15 @@
-                 # kernel older than 2.6.6, that's all we require to
-                 # build the module.
-                 #
-+                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
-
--                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-+                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
-+                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi
-             fi
-         fi
diff --git a/srcpkgs/nvidia304/files/uapi-3.7.patch b/srcpkgs/nvidia304/files/uapi-3.7.patch
deleted file mode 100644
index 75224121063..00000000000
--- a/srcpkgs/nvidia304/files/uapi-3.7.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kernel/conftest.sh.dist	2012-10-11 19:18:22.704848496 -0400
-+++ kernel/conftest.sh	2012-10-12 20:35:55.707213868 -0400
-@@ -20,6 +20,7 @@
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
-
-@@ -118,7 +119,7 @@
-         fi
-     fi
-
--    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
-
-     test_xen
-
-@@ -146,10 +147,10 @@
-         fi
-     fi
-
--    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
-
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
-     elif [ "$ARCH" = "arm" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
-     fi
---- kernel/nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400
-+++ kernel/nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
-@@ -450,7 +450,7 @@
-         NV_PRINT_AT(NV_DBG_MEMINFO, at);
-         nv_vm_list_page_count(&at->page_table[i], pages);
-
--        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+	 vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
-
- #if defined(VM_DRIVER_PAGES)
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index 6660d7a66c8..010fbc84c74 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia304'
 pkgname=nvidia304
-version=304.64
-revision=5
+version=304.84
+revision=1
 short_desc="NVIDIA drivers for linux (304.xx series) -- libraries and utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
@@ -19,11 +19,11 @@ conflicts="catalyst>=0"
 if [ "${XBPS_MACHINE}" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="ftp://download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=23464129f7ea5a00f724f67627206b322b6d08efb7134192a56ba50ea93d2252
+	checksum=4182f09c6c7d7246a373bf616c85c8a1bc2c272e1f4e3a471f6e0f07f3e80e92
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="ftp://download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=b45bbf79599c7344decf79ade1c3d635d20578a0686cda99bc56b39f967163f4
+	checksum=00d5b5a2349cca94684e06975a019fe3be4755df579d511e39e8a143a79fbdc7
 fi
 
 do_extract() {
@@ -35,9 +35,6 @@ do_extract() {
 do_install() {
 	cd ${_pkg}
 
-	patch -Np0 -i ${FILESDIR}/linux-3.7.patch
-	patch -Np0 -i ${FILESDIR}/uapi-3.7.patch
-
 	# X driver
 	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers