Index: etc/defaults/rc.conf
===================================================================
--- etc/defaults/rc.conf	(revision 248554)
+++ etc/defaults/rc.conf	(working copy)
@@ -92,7 +92,7 @@
 fsck_y_flags=""		# Additional flags for fsck -y
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
-netfs_types="nfs:NFS oldnfs:OLDNFS" # Net filesystems.
+netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems.
 extra_netfs_types="NO"	# List of network extra filesystem types for delayed
 			# mount at startup (or NO).
 
Index: etc/mtree/BSD.include.dist
===================================================================
--- etc/mtree/BSD.include.dist	(revision 248554)
+++ etc/mtree/BSD.include.dist	(working copy)
@@ -176,6 +176,8 @@
         ..
         procfs
         ..
+        smbfs
+        ..
         udf
         ..
         unionfs
Index: etc/mtree/BSD.usr.dist
===================================================================
--- etc/mtree/BSD.usr.dist	(revision 248554)
+++ etc/mtree/BSD.usr.dist	(working copy)
@@ -315,6 +315,10 @@
                 srcs
                 ..
             ..
+            smbfs
+                print
+                ..
+            ..
             sunrpc
                 dir
                 ..
Index: include/Makefile
===================================================================
--- include/Makefile	(revision 248554)
+++ include/Makefile	(working copy)
@@ -37,7 +37,7 @@
 	ucontext.h
 
 LDIRS=	bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
-	netipsec ${_netipx} netnatm \
+	netipsec ${_netipx} netnatm netsmb \
 	nfs nfsclient nfsserver \
 	sys vm
 
@@ -48,7 +48,7 @@
 	dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
-	fs/procfs fs/udf fs/unionfs \
+	fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
 	geom/mirror geom/mountver geom/multipath geom/nop \
 	geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \
@@ -80,6 +80,7 @@
 LSUBSUBDIRS+=	netgraph/bluetooth/include
 .endif
 
+# XXX unconditionally needed by <netsmb/netbios.h>
 #.if ${MK_IPX} != "no"
 _netipx=	netipx
 #.endif
Index: lib/Makefile
===================================================================
--- lib/Makefile	(revision 248554)
+++ lib/Makefile	(working copy)
@@ -102,6 +102,7 @@
 	${_librtld_db} \
 	${_libsdp} \
 	${_libsm} \
+	${_libsmb} \
 	${_libsmdb} \
 	${_libsmutil} \
 	libstand \
@@ -205,6 +206,7 @@
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+_libsmb=	libsmb
 _libvgl=	libvgl
 _libproc=	libproc
 _librtld_db=	librtld_db
@@ -216,6 +218,7 @@
 
 .if ${MACHINE_CPUARCH} == "ia64"
 _libefi=	libefi
+_libsmb=	libsmb
 .endif
 
 .if ${MACHINE_CPUARCH} == "mips"
@@ -226,8 +229,13 @@
 .if ${MACHINE_CPUARCH} == "powerpc"
 _libproc=	libproc
 _librtld_db=	librtld_db
+_libsmb=	libsmb
 .endif
 
+.if ${MACHINE_CPUARCH} == "sparc64"
+_libsmb=	libsmb
+.endif
+
 .if ${MK_OPENSSL} != "no"
 _libmp=		libmp
 .endif
Index: lib/libprocstat/Makefile
===================================================================
--- lib/libprocstat/Makefile	(revision 248554)
+++ lib/libprocstat/Makefile	(working copy)
@@ -8,6 +8,7 @@
 	common_kvm.c	\
 	libprocstat.c	\
         msdosfs.c	\
+	smbfs.c		\
 	udf.c
 
 VERSION_DEF=	${.CURDIR}/Versions.def
Index: lib/libprocstat/common_kvm.h
===================================================================
--- lib/libprocstat/common_kvm.h	(revision 248554)
+++ lib/libprocstat/common_kvm.h	(working copy)
@@ -41,6 +41,7 @@
 int	isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
+int	smbfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	udf_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
Index: lib/libprocstat/libprocstat.c
===================================================================
--- lib/libprocstat/libprocstat.c	(revision 248554)
+++ lib/libprocstat/libprocstat.c	(working copy)
@@ -972,6 +972,7 @@
 		FSTYPE(isofs),
 		FSTYPE(msdosfs),
 		FSTYPE(nfs),
+		FSTYPE(smbfs),
 		FSTYPE(udf), 
 		FSTYPE(ufs),
 #ifdef LIBPROCSTAT_ZFS
Index: rescue/rescue/Makefile
===================================================================
--- rescue/rescue/Makefile	(revision 248554)
+++ rescue/rescue/Makefile	(working copy)
@@ -130,6 +130,8 @@
 .if ${MACHINE_CPUARCH} == "i386"
 CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
 CRUNCH_ALIAS_bsdlabel= disklabel
+#CRUNCH_PROGS+= mount_smbfs
+#CRUNCH_LIBS+= -lsmb
 .endif
 
 .if ${MACHINE} == "pc98"
Index: sbin/mount/mount.8
===================================================================
--- sbin/mount/mount.8	(revision 248554)
+++ sbin/mount/mount.8	(working copy)
@@ -448,6 +448,7 @@
 .Cm nfs ,
 .Cm nullfs ,
 .Cm oldnfs ,
+.Cm smbfs ,
 .Cm udf ,
 and
 .Cm unionfs .
@@ -542,6 +543,7 @@
 .Xr mount_msdosfs 8 ,
 .Xr mount_nfs 8 ,
 .Xr mount_nullfs 8 ,
+.Xr mount_smbfs 8 ,
 .Xr mount_udf 8 ,
 .Xr mount_unionfs 8 ,
 .Xr umount 8 ,
Index: sbin/mount/mount.c
===================================================================
--- sbin/mount/mount.c	(revision 248554)
+++ sbin/mount/mount.c	(working copy)
@@ -143,7 +143,7 @@
 	unsigned int i;
 	const char *fs[] = {
 	"cd9660", "mfs", "msdosfs", "nfs",
-	"nullfs", "oldnfs", "udf", "unionfs",
+	"nullfs", "oldnfs", "smbfs", "udf", "unionfs",
 	NULL
 	};
 
Index: share/examples/Makefile
===================================================================
--- share/examples/Makefile	(revision 248554)
+++ share/examples/Makefile	(working copy)
@@ -240,6 +240,7 @@
 .endif
 
 .if ${SHARED} != "symlinks"
+SUBDIR=	smbfs
 .if ${MK_ATF} != "no"
 SUBDIR+=atf
 .endif
Index: share/examples/etc/README.examples
===================================================================
--- share/examples/etc/README.examples	(revision 248554)
+++ share/examples/etc/README.examples	(working copy)
@@ -40,6 +40,7 @@
 network.subr	- routines for network configuration scripts
 networks	- see networks(5)
 newsyslog.conf	- configuration for system log file rotator newsyslog(8)
+nsmb.conf	- smbfs lookups configuration file
 opieaccess	- OPIE database of trusted networks
 pf.conf		- pf(4) example configuration file
 pf.os		- SYN fingerprint database
Index: share/mk/bsd.libnames.mk
===================================================================
--- share/mk/bsd.libnames.mk	(revision 248554)
+++ share/mk/bsd.libnames.mk	(working copy)
@@ -149,6 +149,7 @@
 LIBRTLD_DB?=	${DESTDIR}${LIBDIR}/librtld_db.a
 LIBSBUF?=	${DESTDIR}${LIBDIR}/libsbuf.a
 LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
+LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
 LIBSSH?=	${DESTDIR}${LIBDIR}/libssh.a
 LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a
 LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
Index: sys/conf/NOTES
===================================================================
--- sys/conf/NOTES	(revision 248554)
+++ sys/conf/NOTES	(working copy)
@@ -591,6 +591,12 @@
 options 	NETATALK		#Appletalk communications protocols
 options 	NETATALKDEBUG		#Appletalk debugging
 
+#
+# SMB/CIFS requester
+# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV
+# options.
+options 	NETSMB			#SMB/CIFS requester
+
 # mchain library. It can be either loaded as KLD or compiled into kernel
 options 	LIBMCHAIN
 
@@ -1023,6 +1029,7 @@
 options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	PSEUDOFS_TRACE		#Debugging support for PSEUDOFS
+options 	SMBFS			#SMB/CIFS filesystem
 options 	TMPFS			#Efficient memory filesystem
 options 	UDF			#Universal Disk Format
 options 	UNIONFS			#Union filesystem
Index: sys/conf/files
===================================================================
--- sys/conf/files	(revision 248554)
+++ sys/conf/files	(working copy)
@@ -528,8 +528,8 @@
 crypto/blowfish/bf_skey.c	optional crypto | ipsec
 crypto/camellia/camellia.c	optional crypto | ipsec
 crypto/camellia/camellia-api.c	optional crypto | ipsec
-crypto/des/des_ecb.c		optional crypto | ipsec
-crypto/des/des_setkey.c		optional crypto | ipsec
+crypto/des/des_ecb.c		optional crypto | ipsec | netsmb
+crypto/des/des_setkey.c		optional crypto | ipsec | netsmb
 crypto/rc4/rc4.c		optional netgraph_mppc_encryption | kgssapi
 crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
 					 ipsec | random | wlan_ccmp
@@ -2434,6 +2434,12 @@
 fs/pseudofs/pseudofs_fileno.c	optional pseudofs
 fs/pseudofs/pseudofs_vncache.c	optional pseudofs
 fs/pseudofs/pseudofs_vnops.c	optional pseudofs
+fs/smbfs/smbfs_io.c		optional smbfs
+fs/smbfs/smbfs_node.c		optional smbfs
+fs/smbfs/smbfs_smb.c		optional smbfs
+fs/smbfs/smbfs_subr.c		optional smbfs
+fs/smbfs/smbfs_vfsops.c		optional smbfs
+fs/smbfs/smbfs_vnops.c		optional smbfs
 fs/udf/osta.c			optional udf
 fs/udf/udf_iconv.c		optional udf_iconv
 fs/udf/udf_vfsops.c		optional udf
@@ -2670,6 +2676,7 @@
 kern/kern_xxx.c			standard
 kern/link_elf.c			standard
 kern/linker_if.m		standard
+kern/md4c.c			optional netsmb
 kern/md5c.c			standard
 kern/p1003_1b.c			standard
 kern/posix4_mib.c		standard
@@ -3199,6 +3206,15 @@
 netpfil/pf/pf_ruleset.c		optional pf inet
 netpfil/pf/pf_table.c		optional pf inet
 netpfil/pf/in4_cksum.c		optional pf inet
+netsmb/smb_conn.c		optional netsmb
+netsmb/smb_crypt.c		optional netsmb
+netsmb/smb_dev.c		optional netsmb
+netsmb/smb_iod.c		optional netsmb
+netsmb/smb_rq.c			optional netsmb
+netsmb/smb_smb.c		optional netsmb
+netsmb/smb_subr.c		optional netsmb
+netsmb/smb_trantcp.c		optional netsmb
+netsmb/smb_usr.c		optional netsmb
 nfs/bootp_subr.c		optional bootp nfsclient | bootp nfscl
 nfs/krpc_subr.c			optional bootp nfsclient | bootp nfscl
 nfs/nfs_common.c		optional nfsclient | nfsserver
Index: sys/conf/files.amd64
===================================================================
--- sys/conf/files.amd64	(revision 248554)
+++ sys/conf/files.amd64	(working copy)
@@ -136,7 +136,7 @@
 crypto/aesni/aesni.c		optional aesni
 crypto/aesni/aesni_wrap.c	optional aesni
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
-crypto/des/des_enc.c		optional	crypto | ipsec
+crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 crypto/via/padlock.c		optional	padlock
 crypto/via/padlock_cipher.c	optional	padlock
 crypto/via/padlock_hash.c	optional	padlock
Index: sys/conf/files.arm
===================================================================
--- sys/conf/files.arm	(revision 248554)
+++ sys/conf/files.arm	(working copy)
@@ -59,7 +59,7 @@
 	clean		"board_id.h"
 cddl/compat/opensolaris/kern/opensolaris_atomic.c	optional zfs compile-with "${ZFS_C}"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
-crypto/des/des_enc.c		optional	crypto | ipsec
+crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/fb/fb.c			optional	sc
 dev/hwpmc/hwpmc_arm.c		optional	hwpmc
 dev/kbd/kbd.c			optional	sc
Index: sys/conf/files.i386
===================================================================
--- sys/conf/files.i386	(revision 248554)
+++ sys/conf/files.i386	(working copy)
@@ -122,7 +122,7 @@
 crypto/aesni/aeskeys_i386.S	optional aesni
 crypto/aesni/aesni.c		optional aesni
 crypto/aesni/aesni_wrap.c	optional aesni
-crypto/des/arch/i386/des_enc.S	optional crypto | ipsec
+crypto/des/arch/i386/des_enc.S	optional crypto | ipsec | netsmb
 crypto/via/padlock.c		optional padlock
 crypto/via/padlock_cipher.c	optional padlock
 crypto/via/padlock_hash.c	optional padlock
Index: sys/conf/files.ia64
===================================================================
--- sys/conf/files.ia64	(revision 248554)
+++ sys/conf/files.ia64	(working copy)
@@ -41,7 +41,7 @@
 contrib/ia64/libuwx/src/uwx_uinfo.c		standard
 contrib/ia64/libuwx/src/uwx_utable.c		standard
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
-crypto/des/des_enc.c		optional	crypto | ipsec
+crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/atkbdc/atkbd.c		optional	atkbd atkbdc
 dev/atkbdc/atkbd_atkbdc.c	optional	atkbd atkbdc
 dev/atkbdc/atkbdc.c		optional	atkbdc
Index: sys/conf/files.mips
===================================================================
--- sys/conf/files.mips	(revision 248554)
+++ sys/conf/files.mips	(working copy)
@@ -75,7 +75,7 @@
 
 # crypto support -- use generic
 crypto/blowfish/bf_enc.c		optional	crypto | ipsec 
-crypto/des/des_enc.c			optional	crypto | ipsec
+crypto/des/des_enc.c			optional	crypto | ipsec | netsmb
 
 # AP common nvram interface MIPS specific, but maybe should be more generic
 dev/nvram2env/nvram2env.c		optional	nvram2env
Index: sys/conf/files.pc98
===================================================================
--- sys/conf/files.pc98	(revision 248554)
+++ sys/conf/files.pc98	(working copy)
@@ -77,7 +77,7 @@
 	dependency	"$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
 	compile-with	"${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
 	no-implicit-rule
-crypto/des/arch/i386/des_enc.S	optional crypto | ipsec
+crypto/des/arch/i386/des_enc.S	optional crypto | ipsec | netsmb
 dev/agp/agp_ali.c		optional agp
 dev/agp/agp_amd.c		optional agp
 dev/agp/agp_i810.c		optional agp
Index: sys/conf/files.powerpc
===================================================================
--- sys/conf/files.powerpc	(revision 248554)
+++ sys/conf/files.powerpc	(working copy)
@@ -18,7 +18,7 @@
 cddl/compat/opensolaris/kern/opensolaris_atomic.c			optional zfs powerpc compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S	optional zfs powerpc64 compile-with "${ZFS_S}"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
-crypto/des/des_enc.c		optional	crypto | ipsec
+crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/bm/if_bm.c			optional	bm powermac
 dev/adb/adb_bus.c		optional	adb
 dev/adb/adb_kbd.c		optional	adb
Index: sys/conf/files.sparc64
===================================================================
--- sys/conf/files.sparc64	(revision 248554)
+++ sys/conf/files.sparc64	(working copy)
@@ -24,7 +24,7 @@
 #
 cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S	optional zfs compile-with "${ZFS_S}"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
-crypto/des/des_enc.c		optional	crypto | ipsec
+crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/atkbdc/atkbd.c		optional	atkbd atkbdc
 dev/atkbdc/atkbd_atkbdc.c	optional	atkbd atkbdc
 dev/atkbdc/atkbdc.c		optional	atkbdc
Index: sys/conf/options
===================================================================
--- sys/conf/options	(revision 248554)
+++ sys/conf/options	(working copy)
@@ -219,6 +219,7 @@
 PROCFS		opt_dontuse.h
 PSEUDOFS	opt_dontuse.h
 REISERFS	opt_dontuse.h
+SMBFS		opt_dontuse.h
 TMPFS		opt_dontuse.h
 UDF		opt_dontuse.h
 UNIONFS		opt_dontuse.h
@@ -284,6 +285,9 @@
 # they won't make any difference yet).
 NFS_ROOT	opt_nfsroot.h
 
+# SMB/CIFS requester
+NETSMB		opt_netsmb.h
+
 # Options used only in subr_param.c.
 HZ		opt_param.h
 MAXFILES	opt_param.h
Index: sys/fs/smbfs/smbfs_io.c
===================================================================
--- sys/fs/smbfs/smbfs_io.c	(revision 248554)
+++ sys/fs/smbfs/smbfs_io.c	(working copy)
@@ -36,6 +36,7 @@
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/dirent.h>
+#include <sys/rwlock.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
@@ -460,7 +461,7 @@
 	 */
 	m = pages[reqpage];
 
-	VM_OBJECT_LOCK(object);
+	VM_OBJECT_WLOCK(object);
 	if (m->valid != 0) {
 		for (i = 0; i < npages; ++i) {
 			if (i != reqpage) {
@@ -469,10 +470,10 @@
 				vm_page_unlock(pages[i]);
 			}
 		}
-		VM_OBJECT_UNLOCK(object);
+		VM_OBJECT_WUNLOCK(object);
 		return 0;
 	}
-	VM_OBJECT_UNLOCK(object);
+	VM_OBJECT_WUNLOCK(object);
 
 	scred = smbfs_malloc_scred();
 	smb_makescred(scred, td, cred);
@@ -500,7 +501,7 @@
 
 	relpbuf(bp, &smbfs_pbuf_freecnt);
 
-	VM_OBJECT_LOCK(object);
+	VM_OBJECT_WLOCK(object);
 	if (error && (uio.uio_resid == count)) {
 		printf("smbfs_getpages: error %d\n",error);
 		for (i = 0; i < npages; i++) {
@@ -510,7 +511,7 @@
 				vm_page_unlock(pages[i]);
 			}
 		}
-		VM_OBJECT_UNLOCK(object);
+		VM_OBJECT_WUNLOCK(object);
 		return VM_PAGER_ERROR;
 	}
 
@@ -548,7 +549,7 @@
 		if (i != reqpage)
 			vm_page_readahead_finish(m);
 	}
-	VM_OBJECT_UNLOCK(object);
+	VM_OBJECT_WUNLOCK(object);
 	return 0;
 #endif /* SMBFS_RWGENERIC */
 }
@@ -667,9 +668,9 @@
 	np->n_flag |= NFLUSHINPROG;
 
 	if (vp->v_bufobj.bo_object != NULL) {
-		VM_OBJECT_LOCK(vp->v_bufobj.bo_object);
+		VM_OBJECT_WLOCK(vp->v_bufobj.bo_object);
 		vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC);
-		VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object);
+		VM_OBJECT_WUNLOCK(vp->v_bufobj.bo_object);
 	}
 
 	error = vinvalbuf(vp, V_SAVE, PCATCH, 0);
Index: sys/kern/Make.tags.inc
===================================================================
--- sys/kern/Make.tags.inc	(revision 248554)
+++ sys/kern/Make.tags.inc	(working copy)
@@ -30,6 +30,7 @@
 	${SYS}/fs/msdosfs/*.[ch] \
 	${SYS}/fs/nullfs/*.[ch] \
 	${SYS}/fs/procfs/*.[ch] \
+	${SYS}/fs/smbfs/*.[ch] \
 	${SYS}/fs/udf/*.[ch] \
 	${SYS}/fs/unionfs/*.[ch] \
 	${SYS}/geom/*.[ch] \
Index: sys/kern/sys_generic.c
===================================================================
--- sys/kern/sys_generic.c	(revision 248554)
+++ sys/kern/sys_generic.c	(working copy)
@@ -1498,6 +1498,62 @@
 }
 
 /*
+ * XXX This was created specifically to support netncp and netsmb.  This
+ * allows the caller to specify a socket to wait for events on.  It returns
+ * 0 if any events matched and an error otherwise.  There is no way to
+ * determine which events fired.
+ */
+int
+selsocket(struct socket *so, int events, struct timeval *tvp, struct thread *td)
+{
+	struct timeval atv, rtv, ttv;
+	int error, timo;
+
+	if (tvp != NULL) {
+		atv = *tvp;
+		if (itimerfix(&atv))
+			return (EINVAL);
+		getmicrouptime(&rtv);
+		timevaladd(&atv, &rtv);
+	} else {
+		atv.tv_sec = 0;
+		atv.tv_usec = 0;
+	}
+
+	timo = 0;
+	seltdinit(td);
+	/*
+	 * Iterate until the timeout expires or the socket becomes ready.
+	 */
+	for (;;) {
+		selfdalloc(td, NULL);
+		error = sopoll(so, events, NULL, td);
+		/* error here is actually the ready events. */
+		if (error)
+			return (0);
+		if (atv.tv_sec || atv.tv_usec) {
+			getmicrouptime(&rtv);
+			if (timevalcmp(&rtv, &atv, >=)) {
+				seltdclear(td);
+				return (EWOULDBLOCK);
+			}
+			ttv = atv;
+			timevalsub(&ttv, &rtv);
+			timo = ttv.tv_sec > 24 * 60 * 60 ?
+			    24 * 60 * 60 * hz : tvtohz(&ttv);
+		}
+		error = seltdwait(td, timo, 0);
+		seltdclear(td);
+		if (error)
+			break;
+	}
+	/* XXX Duplicates ncp/smb behavior. */
+	if (error == ERESTART)
+		error = 0;
+	return (error);
+}
+
+/*
  * Preallocate two selfds associated with 'cookie'.  Some fo_poll routines
  * have two select sets, one for read and another for write.
  */
Index: sys/modules/Makefile
===================================================================
--- sys/modules/Makefile	(revision 248554)
+++ sys/modules/Makefile	(working copy)
@@ -296,6 +296,7 @@
 	siis \
 	sis \
 	sk \
+	${_smbfs} \
 	${_sn} \
 	${_snc} \
 	snp \
@@ -515,6 +516,7 @@
 _safe=		safe
 _sbni=		sbni
 _scsi_low=	scsi_low
+_smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
 _splash=	splash
@@ -712,6 +714,7 @@
 _safe=		safe
 _scsi_low=	scsi_low
 _sfxge=		sfxge
+_smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
 _splash=	splash
@@ -768,6 +771,7 @@
 _mly=		mly
 _pccard=	pccard
 _scsi_low=	scsi_low
+_smbfs=		smbfs
 _sound=		sound
 _splash=	splash
 _sppp=		sppp
@@ -790,6 +794,7 @@
 _exca=		exca
 _nvram=		powermac_nvram
 _pccard=	pccard
+_smbfs=		smbfs
 _sound=		sound
 _cyclic=	cyclic
 _dtrace=	dtrace
@@ -816,6 +821,7 @@
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
 .endif
+_smbfs=		smbfs
 _sound=		sound
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 _zfs=		zfs
Index: sys/sys/socketvar.h
===================================================================
--- sys/sys/socketvar.h	(revision 248554)
+++ sys/sys/socketvar.h	(working copy)
@@ -371,6 +371,8 @@
 void	soupcall_set(struct socket *so, int which,
 	    int (*func)(struct socket *, void *, int), void *arg);
 void	sowakeup(struct socket *so, struct sockbuf *sb);
+int	selsocket(struct socket *so, int events, struct timeval *tv,
+	    struct thread *td);
 
 /*
  * Accept filter functions (duh).
Index: usr.bin/Makefile.amd64
===================================================================
--- usr.bin/Makefile.amd64	(revision 248554)
+++ usr.bin/Makefile.amd64	(working copy)
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
Index: usr.bin/Makefile.i386
===================================================================
--- usr.bin/Makefile.i386	(revision 248554)
+++ usr.bin/Makefile.i386	(working copy)
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
Index: usr.bin/Makefile.ia64
===================================================================
--- usr.bin/Makefile.ia64	(revision 248554)
+++ usr.bin/Makefile.ia64	(working copy)
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
Index: usr.bin/Makefile.powerpc
===================================================================
--- usr.bin/Makefile.powerpc	(revision 248554)
+++ usr.bin/Makefile.powerpc	(working copy)
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
Index: usr.bin/Makefile.sparc64
===================================================================
--- usr.bin/Makefile.sparc64	(revision 248554)
+++ usr.bin/Makefile.sparc64	(working copy)
@@ -1,2 +1,3 @@
 # $FreeBSD$
 
+SUBDIR+=	smbutil
Index: usr.bin/kdump/kdump.c
===================================================================
--- usr.bin/kdump/kdump.c	(revision 248554)
+++ usr.bin/kdump/kdump.c	(working copy)
@@ -1429,6 +1429,8 @@
  TODO: Support additional address families
 	#include <netnatm/natm.h>
 	struct sockaddr_natm	*natm;
+	#include <netsmb/netbios.h>
+	struct sockaddr_nb	*nb;
 */
 	char addr[64];
 
Index: usr.sbin/Makefile.amd64
===================================================================
--- usr.sbin/Makefile.amd64	(revision 248554)
+++ usr.sbin/Makefile.amd64	(working copy)
@@ -20,6 +20,7 @@
 SUBDIR+=	cpucontrol
 SUBDIR+=	kgmon
 SUBDIR+=	lptcontrol
+SUBDIR+=	mount_smbfs
 SUBDIR+=	mptable
 .if ${MK_NDIS} != "no"
 SUBDIR+=	ndiscvt
Index: usr.sbin/Makefile.i386
===================================================================
--- usr.sbin/Makefile.i386	(revision 248554)
+++ usr.sbin/Makefile.i386	(working copy)
@@ -12,6 +12,7 @@
 SUBDIR+=	kgmon
 SUBDIR+=	kgzip
 SUBDIR+=	lptcontrol
+SUBDIR+=	mount_smbfs
 SUBDIR+=	mptable
 .if ${MK_NDIS} != "no"
 SUBDIR+=	ndiscvt
Index: usr.sbin/Makefile.ia64
===================================================================
--- usr.sbin/Makefile.ia64	(revision 248554)
+++ usr.sbin/Makefile.ia64	(working copy)
@@ -4,5 +4,6 @@
 SUBDIR+=	acpi
 .endif
 SUBDIR+=	kgmon
+SUBDIR+=	mount_smbfs
 SUBDIR:=	${SUBDIR:Nuathload}
 SUBDIR+=	zzz
Index: usr.sbin/Makefile.powerpc
===================================================================
--- usr.sbin/Makefile.powerpc	(revision 248554)
+++ usr.sbin/Makefile.powerpc	(working copy)
@@ -1,4 +1,5 @@
 # $FreeBSD$
 
+SUBDIR+=	mount_smbfs
 SUBDIR+=	nvram
 SUBDIR+=	ofwdump
Index: usr.sbin/Makefile.sparc64
===================================================================
--- usr.sbin/Makefile.sparc64	(revision 248554)
+++ usr.sbin/Makefile.sparc64	(working copy)
@@ -1,4 +1,5 @@
 # $FreeBSD$
 
 SUBDIR+=	eeprom
+SUBDIR+=	mount_smbfs
 SUBDIR+=	ofwdump