diff -Nur /usr/ports/x11/nvidia-driver/Makefile nvidia-driver/Makefile
--- /usr/ports/x11/nvidia-driver/Makefile	Mon Sep 12 23:14:28 2005
+++ nvidia-driver/Makefile	Wed Oct 12 15:36:46 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvidia-driver
 PORTVERSION=	1.0.${NVVERSION}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 MASTER_SITES=	http://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		ftp://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \
 		http://download1.nvidia.com/freebsd/1.0-${NVVERSION}/ \
@@ -98,6 +98,13 @@
 XSERVVERSION!=	/usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || /usr/sbin/pkg_info -O x11-servers/xorg-server 2>/dev/null | ${GREP} server- || true
 XLIBVERSION!=	/usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O x11/xorg-libraries 2>/dev/null | ${GREP} libraries- || true
 
+.if !exists(${PREFIX}/kld)
+PLIST_SUB+=	KLD="@comment "
+.else
+PLIST_SUB+=	KLD=""
+INSTALLKLD=
+.endif
+
 PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
 		LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}
 
@@ -143,8 +150,18 @@
 	${REINPLACE_CMD} 's/define NV_SUPPORT_LINUX_COMPAT/undef NV_SUPPORT_LINUX_COMPAT/' \
 		${WRKSRC}/src/nv-freebsd.h
 .endif
+	uuencode -o ${WRKSRC}/src/nv-kernel.o.uu ${WRKSRC}/src/nv-kernel.o nv-kernel.o
+	${RM} ${WRKSRC}/src/nv-kernel.o
 
 post-install:
+.if defined(INSTALLKLD)
+	${MKDIR} -p ${PREFIX}/kld/nvidia/src
+	${CP} ${FILESDIR}/kld-Makefile ${PREFIX}/kld/nvidia/Makefile
+	${CP} ${WRKSRC}/src/*.[ch] ${PREFIX}/kld/nvidia/src
+	${CP} ${WRKSRC}/src/Makefile ${PREFIX}/kld/nvidia/src
+	${CP} ${WRKSRC}/src/nv-kernel.o.uu ${PREFIX}/kld/nvidia/src
+.endif
+
 	${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .if ${OSVERSION} < 500000
 .for dev in 0 1 2 3
diff -Nur /usr/ports/x11/nvidia-driver/files/kld-Makefile nvidia-driver/files/kld-Makefile
--- /usr/ports/x11/nvidia-driver/files/kld-Makefile	Thu Jan  1 09:30:00 1970
+++ nvidia-driver/files/kld-Makefile	Tue Oct 11 14:23:40 2005
@@ -0,0 +1,4 @@
+SUBDIR=	src
+
+.include <bsd.subdir.mk>
+
diff -Nur /usr/ports/x11/nvidia-driver/files/patch-src::Makefile nvidia-driver/files/patch-src::Makefile
--- /usr/ports/x11/nvidia-driver/files/patch-src::Makefile	Thu Jan  1 09:30:00 1970
+++ nvidia-driver/files/patch-src::Makefile	Wed Oct 12 15:18:53 2005
@@ -0,0 +1,32 @@
+--- src/Makefile.orig	Sat Jul 30 06:38:44 2005
++++ src/Makefile	Tue Oct 11 14:48:48 2005
+@@ -5,25 +5,17 @@
+ KMOD=		nvidia
+ RMOBJ=		nv-kernel.o
+ 
+-BSDVER!=	/sbin/sysctl -n kern.osreldate
+-.if ${BSDVER} >= 500011
+-KMODDIR?=	/boot/modules
+-.endif
+-
++NVIDIA_ROOT=	${.CURDIR}/..
+ SRCS=		nvidia_ctl.c nvidia_dev.c nvidia_linux.c nvidia_os.c nvidia_os_pci.c nvidia_os_registry.c nvidia_pci.c nvidia_subr.c nvidia_sysctl.c 
+ SRCS+=		device_if.h bus_if.h pci_if.h vnode_if.h
+ CFLAGS+=	-I${NVIDIA_ROOT}/src -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=7676 
+ CFLAGS+=	-D__KERNEL__ -UDEBUG -U_DEBUG -DNDEBUG -O -fno-common -fno-unit-at-a-time -minline-all-stringops
+ 
+ OBJS+=		${RMOBJ}
++NO_OBJ=		true
+ NOOBJ=		true
+ 
+-beforeinstall:	${KMOD}.ko
+-
+-${OSOBJ}: ${KMOD}.ko
+-	ld -r -o $@ ${OBJS:S/${RMOBJ}//}
+-
+-clean:
+-	rm -f ${CLEANFILES:S/${RMOBJ}//}
++nv-kernel.o:	nv-kernel.o.uu
++	uudecode -o ${.TARGET} ${.ALLSRC}
+ 
+ .include <bsd.kmod.mk>
diff -Nur /usr/ports/x11/nvidia-driver/files/patch-x11::Makefile nvidia-driver/files/patch-x11::Makefile
--- /usr/ports/x11/nvidia-driver/files/patch-x11::Makefile	Thu Jan  1 09:30:00 1970
+++ nvidia-driver/files/patch-x11::Makefile	Wed Oct 12 11:53:09 2005
@@ -0,0 +1,9 @@
+--- x11/Makefile.orig	Wed Oct 12 11:52:41 2005
++++ x11/Makefile	Wed Oct 12 11:52:48 2005
+@@ -1,5 +1,4 @@
+ SUBDIR=	driver		\
+-	extension	\
+-	bin
++	extension
+ 
+ .include <bsd.subdir.mk>
diff -Nur /usr/ports/x11/nvidia-driver/pkg-plist nvidia-driver/pkg-plist
--- /usr/ports/x11/nvidia-driver/pkg-plist	Wed May 25 01:27:37 2005
+++ nvidia-driver/pkg-plist	Wed Oct 12 15:45:25 2005
@@ -44,8 +44,30 @@
 %%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/vm_object.c_5.2.diff
 %%DIFFS%%%%PORTDOCS%%share/doc/NVIDIA_GLX-1.0/device_pager.c_5.2.diff
 %%PORTDOCS%%@dirrm share/doc/NVIDIA_GLX-1.0
+%%KLD%%@unexec (cd %D/kld/nvidia ; make clean)
+%%KLD%%kld/nvidia/src/os-interface.h
+%%KLD%%kld/nvidia/src/nvtypes.h
+%%KLD%%kld/nvidia/src/nvidia_sysctl.c
+%%KLD%%kld/nvidia/src/nvidia_subr.c
+%%KLD%%kld/nvidia/src/nvidia_pci.c
+%%KLD%%kld/nvidia/src/nvidia_os_registry.c
+%%KLD%%kld/nvidia/src/nvidia_os_pci.c
+%%KLD%%kld/nvidia/src/nvidia_os.c
+%%KLD%%kld/nvidia/src/nvidia_linux.c
+%%KLD%%kld/nvidia/src/nvidia_dev.c
+%%KLD%%kld/nvidia/src/nvidia_ctl.c
+%%KLD%%kld/nvidia/src/nv.h
+%%KLD%%kld/nvidia/src/nv-misc.h
+%%KLD%%kld/nvidia/src/nv-freebsd.h
+%%KLD%%kld/nvidia/src/cpuopsys.h
+%%KLD%%kld/nvidia/src/rmretval.h
+%%KLD%%kld/nvidia/src/Makefile
+%%KLD%%kld/nvidia/src/nv-kernel.o.uu
+%%KLD%%kld/nvidia/Makefile
+%%KLD%%@dirrm kld/nvidia/src
+%%KLD%%@dirrm kld/nvidia
 %%FREEBSD4%%@cwd /modules
-%%FREEBSD5%%@cwd /boot/modules
+%%FREEBSD5%%@cwd /boot/kernel
 nvidia.ko
 %%FREEBSD5%%@unexec kldxref %D
 %%FREEBSD4%%@cwd /dev