--- a/.hgignore	Sun Jan 27 22:07:58 2013 +0000
+++ b/.hgignore	Sun Jan 27 23:13:51 2013 +0000
@@ -6,7 +6,7 @@
 components/kvm/joyent-illumos-kvm-b0749fb*
 components/meta-packages/history/build*
 components/mtr/mtr-0.82*
-components/nvidia/NVIDIA-Solaris-x86-295*
+components/nvidia/NVIDIA-Solaris-x86-304*
 components/python/*/build*
 components/python/cherrypy/CherryPy-3.1.2*
 components/python/coverage/coverage-3.5*

--- a/components/nvidia-incorporation/nvidia-incorporation.p5m	Sun Jan 27 22:07:58 2013 +0000
+++ b/components/nvidia-incorporation/nvidia-incorporation.p5m	Sun Jan 27 23:13:51 2013 +0000
@@ -19,7 +19,7 @@
 set name=pkg.summary value="nvidia consolidation incorporation"
 set name=description value="nvidia consolidation incorporation"
 set name=variant.arch value=$(MACH)
-depend fmri=driver/graphics/[email protected] type=incorporate
+depend fmri=driver/graphics/[email protected] type=incorporate
 depend fmri=image/nvidia/[email protected] type=incorporate
 depend [email protected] type=incorporate
 depend [email protected] type=incorporate

--- a/components/nvidia/Makefile	Sun Jan 27 22:07:58 2013 +0000
+++ b/components/nvidia/Makefile	Sun Jan 27 23:13:51 2013 +0000
@@ -9,17 +9,17 @@
 #
 
 #
-# Copyright 2011, Andrzej Szeszo 
+# Copyright 2011, Andrzej Szeszo
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		driver-graphics-nvidia
-COMPONENT_VERSION=	295.75
-IPS_COMPONENT_VERSION=	0.295.75
+COMPONENT_VERSION=	304.64
+IPS_COMPONENT_VERSION=	0.304.64
 COMPONENT_SRC=		NVIDIA-Solaris-x86-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).run
-COMPONENT_ARCHIVE_HASH=	sha256:777ca69bf2fd35cfd3052eeaf069858287a1983e6f303c6b779051524809404c
+COMPONENT_ARCHIVE_HASH=	sha256:07e9681d7570988c07965dba8a3c0094a7a9feb9d52cfc35b5c5b1784c1046bc
 COMPONENT_ARCHIVE_URL=	http://download.nvidia.com/solaris/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk

--- a/components/nvidia/driver-graphics-nvidia.p5m	Sun Jan 27 22:07:58 2013 +0000
+++ b/components/nvidia/driver-graphics-nvidia.p5m	Sun Jan 27 23:13:51 2013 +0000
@@ -100,6 +100,8 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 driver name=nvidia perms="* 0666 root root" \
+    alias=pci10de,1022 \
+    alias=pci10de,1028 \
     alias=pci10de,1040 \
     alias=pci10de,1042 \
     alias=pci10de,1048 \
@@ -136,8 +138,21 @@
     alias=pci10de,10d8 \
     alias=pci10de,1140 \
     alias=pci10de,1180 \
+    alias=pci10de,1083 \
+    alias=pci10de,1085 \
     alias=pci10de,1188 \
     alias=pci10de,1189 \
+    alias=pci10de,118f \
+    alias=pci10de,11a0 \
+    alias=pci10de,11a1 \
+    alias=pci10de,11a7 \
+    alias=pci10de,11ba \
+    alias=pci10de,11bc \
+    alias=pci10de,11bd \
+    alias=pci10de,11be \
+    alias=pci10de,11bf \
+    alias=pci10de,11c0 \
+    alias=pci10de,11c6 \
     alias=pci10de,1200 \
     alias=pci10de,1201 \
     alias=pci10de,1203 \
@@ -548,6 +563,7 @@
     alias=pci10de,de0 \
     alias=pci10de,de1 \
     alias=pci10de,de2 \
+    alias=pci10de,de3 \
     alias=pci10de,de4 \
     alias=pci10de,de5 \
     alias=pci10de,de8 \
@@ -590,6 +606,7 @@
     alias=pci10de,fc0 \
     alias=pci10de,fc1 \
     alias=pci10de,fc2 \
+    alias=pci10de,fc6 \
     alias=pci10de,fce \
     alias=pci10de,fd1 \
     alias=pci10de,fd2 \
@@ -597,7 +614,12 @@
     alias=pci10de,fd4 \
     alias=pci10de,fd5 \
     alias=pci10de,fd8 \
+    alias=pci10de,fd9 \
     alias=pci10de,fe0 \
+    alias=pci10de,ff2 \
+    alias=pci10de,ffb \
+    alias=pci10de,ffc \
+    alias=pci10de,ffd \
     alias=pci10de,fff
 file Solaris/gl.h path=usr/X11/include/NVIDIA/GL/gl.h
 file Solaris/glext.h path=usr/X11/include/NVIDIA/GL/glext.h