diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index f7db620ade1d..4b66c1c029c3 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_conf.c,v 1.17 1997/06/02 04:56:38 julian Exp $
+ * $Id: kern_conf.c,v 1.18 1997/08/02 14:31:26 bde Exp $
  */
 
 #include <sys/param.h>
@@ -179,7 +179,7 @@ cdevsw_make(struct bdevsw *from)
 	to->d_stop = nostop;
 	to->d_reset = nullreset;
 	to->d_devtotty = nodevtotty;
-	to->d_select = seltrue;
+	to->d_poll = seltrue;
 	to->d_mmap = nommap;
 	to->d_strategy = from->d_strategy;
 	to->d_name = from->d_name;
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 897e3f85ef09..dc28e215a643 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.38 1997/04/09 16:53:38 bde Exp $
+ * $Id: kern_descrip.c,v 1.39 1997/08/26 00:09:44 bde Exp $
  */
 
 #include <sys/param.h>
@@ -73,7 +73,7 @@ static	 d_open_t  fdopen;
 static struct cdevsw fildesc_cdevsw = 
 	{ fdopen,	noclose,	noread,		nowrite,
 	  noioc,	nostop,		nullreset,	nodevtotty,
-	  noselect,	nommap,		nostrat };
+	  seltrue,	nommap,		nostrat };
 
 static int finishdup __P((struct filedesc *fdp, int old, int new, int *retval));
 /*
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 738de5b8a032..a3314cff3fea 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.40 1997/04/06 11:08:19 dufault Exp $
+ * $Id: kern_lkm.c,v 1.41 1997/08/02 14:31:32 bde Exp $
  */
 
 #include <sys/param.h>
@@ -90,7 +90,7 @@ static	d_ioctl_t	lkmcioctl;
 static struct cdevsw lkmc_cdevsw = 
 	{ lkmcopen,	lkmcclose,	noread,		nowrite,	/*32*/
 	  lkmcioctl,	nostop,		nullreset,	nodevtotty,
-	  noselect,	nommap,		NULL,	"lkm",	NULL,	-1 };
+	  seltrue,	nommap,		NULL,	"lkm",	NULL,	-1 };
 
 
 /*ARGSUSED*/
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index e0394b726b22..5f9c5e38ca46 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $Id: sys_socket.c,v 1.14 1997/08/02 14:31:36 bde Exp $
+ * $Id: sys_socket.c,v 1.15 1997/08/16 19:15:02 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -54,7 +54,7 @@ static int soo_write __P((struct file *fp, struct uio *uio,
 static int soo_close __P((struct file *fp, struct proc *p));
 
 struct	fileops socketops =
-    { soo_read, soo_write, soo_ioctl, soo_select, soo_close };
+    { soo_read, soo_write, soo_ioctl, soo_poll, soo_close };
 
 /* ARGSUSED */
 static int
@@ -138,13 +138,14 @@ soo_ioctl(fp, cmd, data, p)
 }
 
 int
-soo_select(fp, which, p)
+soo_poll(fp, events, cred, p)
 	struct file *fp;
-	int which;
+	int events;
+	struct ucred *cred;
 	struct proc *p;
 {
 	struct socket *so = (struct socket *)fp->f_data;
-	return so->so_proto->pr_usrreqs->pru_soselect(so, which, p);
+	return so->so_proto->pr_usrreqs->pru_sopoll(so, events, cred, p);
 }
 
 int
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 4bc700960855..1d86d153f8da 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.25 1997/09/02 01:18:23 bde Exp $
+ *	$Id: uipc_usrreq.c,v 1.26 1997/09/02 20:05:59 bde Exp $
  */
 
 #include <sys/param.h>
@@ -413,7 +413,7 @@ struct pr_usrreqs uipc_usrreqs = {
 	uipc_connect2, pru_control_notsupp, uipc_detach, uipc_disconnect,
 	uipc_listen, uipc_peeraddr, uipc_rcvd, pru_rcvoob_notsupp,
 	uipc_send, uipc_sense, uipc_shutdown, uipc_sockaddr,
-	sosend, soreceive, soselect
+	sosend, soreceive, sopoll
 };
 	
 /*