diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 7aa6271a0ac2..9704d6888cc6 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nvidia-driver
 PORTVERSION=	1.0.${NVVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		ftp://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
diff --git a/x11/nvidia-driver/files/patch-lib::Makefile b/x11/nvidia-driver/files/patch-lib::Makefile
new file mode 100644
index 000000000000..a13784cc0c8a
--- /dev/null
+++ b/x11/nvidia-driver/files/patch-lib::Makefile
@@ -0,0 +1,26 @@
+--- lib/Makefile.orig	Mon Aug 16 17:05:30 2004
++++ lib/Makefile	Mon Aug 16 17:07:47 2004
+@@ -1,13 +1,19 @@
+ SUBDIR= libGL		\
+ 	libnvidia-tls	\
+ 	libGLcore	\
+-	libXvMCNVIDIA	\
+-	compat
++	libXvMCNVIDIA
+ 
+-FIND_DIRS=	/usr/lib ${X11BASE}/lib \
+-		/compat/linux/lib \
++.if !defined(WITHOUT_LINUX)
++SUBDIR+=	compat
++.endif
++
++FIND_DIRS=	/usr/lib ${X11BASE}/lib
++
++.if !defined(WITHOUT_LINUX)
++FIND_DIRS+=	/compat/linux/lib \
+ 		/compat/linux/usr/lib \
+ 		/compat/linux/usr/X11R6/lib
++.endif
+ 
+ FIND_FILES!=(find ${FIND_DIRS} \
+ 		-name libGL.a\* -or \