diff -urN vmware-guestd6.orig/Makefile vmware-guestd6/Makefile
--- vmware-guestd6.orig/Makefile	2009-01-06 04:44:00.000000000 +0900
+++ vmware-guestd6/Makefile	2009-01-07 14:38:10.000000000 +0900
@@ -7,7 +7,7 @@
 
 PORTNAME=	vmware
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	emulators kld
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-guestd
@@ -98,20 +98,7 @@
 .endif
 
 .if defined(WITH_VMWARE_VMXNET)
-.if ${OSVERSION} < 700000
 PLIST_SUB+=	VMWARE_VMXNET=""
-.if ${BITS} == 32
-VMWARE_VMXNET_PATH=	6.0-i386/vmxnet.ko
-.else
-# VMware doesn't provide 6.0-amd64/vmxnet.ko
-.undef WITH_VMWARE_VMXNET
-PLIST_SUB+=	VMWARE_VMXNET="@comment "
-.endif
-.else
-# VMware doesn't provide vmxnet.ko for other versions
-.undef WITH_VMWARE_VMXNET
-PLIST_SUB+=	VMWARE_VMXNET="@comment "
-.endif
 .else
 PLIST_SUB+=	VMWARE_VMXNET="@comment "
 .endif
@@ -157,6 +144,9 @@
 .if defined(WITH_VMWARE_VMMEMCTL)
 	(cd ${WRKDIR}; ${TAR} xf ${WRKSRC}/lib/modules/source/vmmemctl.tar)
 .endif
+.if defined(WITH_VMWARE_VMXNET)
+	(cd ${WRKDIR}; ${TAR} xf ${WRKSRC}/lib/modules/source/vmxnet.tar)
+.endif
 
 .if defined(VMWARE_X_PORTS)
 
@@ -182,6 +172,9 @@
 .if defined(WITH_VMWARE_VMMEMCTL)
 	(cd ${WRKDIR}/vmmemctl-only; make)
 .endif
+.if defined(WITH_VMWARE_VMXNET)
+	(cd ${WRKDIR}/vmxnet-only; make)
+.endif
 
 do-install:
 	@if [ -f ${PREFIX}/etc/rc.d/${USE_RC_SUBR} ]; then \
@@ -190,13 +183,14 @@
 	fi
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-checkvm ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${BITS}${OSSFX}/libdnet.so.1/libdnet.so.1 ${PREFIX}/lib
 .if defined(WITH_VMWARE_VMMEMCTL)
 	${MKDIR} ${VMWARE_KMODDIR}
-	${INSTALL_KLD} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
+	${INSTALL_KLD} ${WRKDIR}/vmmemctl.ko ${VMWARE_KMODDIR}
 .endif
 .if defined(WITH_VMWARE_VMXNET)
 	${MKDIR} ${VMWARE_KMODDIR}
-	${INSTALL_KLD} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR}
+	${INSTALL_KLD} ${WRKDIR}/vmxnet.ko ${VMWARE_KMODDIR}
 .endif
 	-${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1
 	${MKDIR} ${PREFIX}/share/vmware-tools
diff -urN vmware-guestd6.orig/pkg-plist vmware-guestd6/pkg-plist
--- vmware-guestd6.orig/pkg-plist	2008-03-29 23:02:50.000000000 +0900
+++ vmware-guestd6/pkg-plist	2009-01-07 14:26:05.000000000 +0900
@@ -1,6 +1,7 @@
 @stopdaemon vmware-guestd
 sbin/vmware-checkvm
 sbin/vmware-guestd
+lib/libdnet.so.1
 %%VMWARE_VMMEMCTL%%lib/vmware-tools/modules/vmmemctl.ko
 %%VMWARE_VMXNET%%lib/vmware-tools/modules/vmxnet.ko
 %%VMWARE_KMODDIR%%@dirrmtry lib/vmware-tools/modules