diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 91c33fe5ff4..de5d4b7c4f1 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.206 1996/09/28 22:37:33 dyson Exp $
+ *	$Id: machdep.c,v 1.207 1996/10/05 10:44:03 jkh Exp $
  */
 
 #include "npx.h"
@@ -250,12 +250,6 @@ cpu_startup(dummy)
 	 */
 	setup_netisrs(&netisr_set);
 
-/*
-#ifdef ISDN
-	DONET(isdnintr, NETISR_ISDN);
-#endif
-*/
-
 	/*
 	 * Allocate space for system data structures.
 	 * The first available kernel virtual address is in "v".
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f28c9d9d90b..76ce65e60e7 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.283 1996/10/09 18:36:43 bde Exp $
+#	$Id: LINT,v 1.284 1996/10/18 03:52:48 jkh Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -422,8 +422,8 @@ options		OD_AUTO_TURNOFF
 # Of these, only the `log' device is truly mandatory.  The `pty'
 # device usually turns out to be ``effectively mandatory'', as it is
 # required for `telnetd', `rlogind', `screen', `emacs', and `xterm',
-# among others.  The `isdn', `ii', `ity', `itel', and `ispy' devices
-# are all required when ISDN support is used.  If you wish to run certain
+# among others. 
+# If you wish to run certain
 # system utilities which are compressed by default (like /stand/sysinstall)
 # then `gzip' becomes mandatory too.
 #
@@ -435,13 +435,6 @@ pseudo-device	vn		#Vnode driver (turns a file into a device)
 pseudo-device	snp	3	#Snoop device - to look at pty/vty/etc..
 pseudo-device	ccd	4	#Concatenated disk driver
 
-# These are non-optional for ISDN
-pseudo-device   isdn
-pseudo-device   ii      4
-pseudo-device   ity     4
-pseudo-device   itel    2       
-pseudo-device   ispy    1       
-
 # These are only for watching for bitrot in old tty code.
 # broken
 #pseudo-device	tb
@@ -704,19 +697,6 @@ device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
 device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
 
 
-#
-# ISDN drivers - `isdn'.
-#
-# Uncomment one (and only one) of the following two drivers for the appropriate
-# ISDN device you have.  For more information on what's considered appropriate
-# for your given set of circumstances, please read
-# /usr/src/gnu/usr.sbin/isdn/docs/INSTALL.  It's a bit sparse at present, but
-# it's the best we have right now.  The snic driver is also disabled at present,
-# waiting for someone to upgrade the driver to 2.0 (it's in /sys/gnu/scsi/).
-#
-device nic0 at isa? port "IO_COM3" iomem 0xe0000 tty irq 9 vector nicintr
-device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
-
 #
 # Audio drivers: `snd', `sb', `pas', `gus', `pca'
 #
diff --git a/sys/conf/majors b/sys/conf/majors
index 26e5534f059..d54c1e26725 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.7 1996/08/31 07:04:04 jkh Exp $
+$Id: majors.i386,v 1.8 1996/10/10 20:41:13 phk Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -91,13 +91,13 @@ chrdev	name		comments
 51	joy		joystick
 52	tun		IP tunnel device
 53	snp		tty snoop
-54	nic		ISDN system
-55	isdn		ISDN system
-56	ity		ISDN system
-57	itel		ISDN system
+54	OLDnic		ISDN system
+55	OLDisdn		ISDN system
+56	OLDity		ISDN system
+57	OLDitel		ISDN system
 58	dgb		Digiboard
-59	ispy		ISDN system
-60	nnic		ISDN system
+59	OLDispy		ISDN system
+60	OLDnnic		ISDN system
 61	pt		SCSI "processor type"
 62	worm		SCSI "worm type"
 63	rc		Riscom/8 driver
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index f28c9d9d90b..76ce65e60e7 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.283 1996/10/09 18:36:43 bde Exp $
+#	$Id: LINT,v 1.284 1996/10/18 03:52:48 jkh Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -422,8 +422,8 @@ options		OD_AUTO_TURNOFF
 # Of these, only the `log' device is truly mandatory.  The `pty'
 # device usually turns out to be ``effectively mandatory'', as it is
 # required for `telnetd', `rlogind', `screen', `emacs', and `xterm',
-# among others.  The `isdn', `ii', `ity', `itel', and `ispy' devices
-# are all required when ISDN support is used.  If you wish to run certain
+# among others. 
+# If you wish to run certain
 # system utilities which are compressed by default (like /stand/sysinstall)
 # then `gzip' becomes mandatory too.
 #
@@ -435,13 +435,6 @@ pseudo-device	vn		#Vnode driver (turns a file into a device)
 pseudo-device	snp	3	#Snoop device - to look at pty/vty/etc..
 pseudo-device	ccd	4	#Concatenated disk driver
 
-# These are non-optional for ISDN
-pseudo-device   isdn
-pseudo-device   ii      4
-pseudo-device   ity     4
-pseudo-device   itel    2       
-pseudo-device   ispy    1       
-
 # These are only for watching for bitrot in old tty code.
 # broken
 #pseudo-device	tb
@@ -704,19 +697,6 @@ device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
 device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
 
 
-#
-# ISDN drivers - `isdn'.
-#
-# Uncomment one (and only one) of the following two drivers for the appropriate
-# ISDN device you have.  For more information on what's considered appropriate
-# for your given set of circumstances, please read
-# /usr/src/gnu/usr.sbin/isdn/docs/INSTALL.  It's a bit sparse at present, but
-# it's the best we have right now.  The snic driver is also disabled at present,
-# waiting for someone to upgrade the driver to 2.0 (it's in /sys/gnu/scsi/).
-#
-device nic0 at isa? port "IO_COM3" iomem 0xe0000 tty irq 9 vector nicintr
-device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
-
 #
 # Audio drivers: `snd', `sb', `pas', `gus', `pca'
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f28c9d9d90b..76ce65e60e7 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.283 1996/10/09 18:36:43 bde Exp $
+#	$Id: LINT,v 1.284 1996/10/18 03:52:48 jkh Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -422,8 +422,8 @@ options		OD_AUTO_TURNOFF
 # Of these, only the `log' device is truly mandatory.  The `pty'
 # device usually turns out to be ``effectively mandatory'', as it is
 # required for `telnetd', `rlogind', `screen', `emacs', and `xterm',
-# among others.  The `isdn', `ii', `ity', `itel', and `ispy' devices
-# are all required when ISDN support is used.  If you wish to run certain
+# among others. 
+# If you wish to run certain
 # system utilities which are compressed by default (like /stand/sysinstall)
 # then `gzip' becomes mandatory too.
 #
@@ -435,13 +435,6 @@ pseudo-device	vn		#Vnode driver (turns a file into a device)
 pseudo-device	snp	3	#Snoop device - to look at pty/vty/etc..
 pseudo-device	ccd	4	#Concatenated disk driver
 
-# These are non-optional for ISDN
-pseudo-device   isdn
-pseudo-device   ii      4
-pseudo-device   ity     4
-pseudo-device   itel    2       
-pseudo-device   ispy    1       
-
 # These are only for watching for bitrot in old tty code.
 # broken
 #pseudo-device	tb
@@ -704,19 +697,6 @@ device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
 device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
 
 
-#
-# ISDN drivers - `isdn'.
-#
-# Uncomment one (and only one) of the following two drivers for the appropriate
-# ISDN device you have.  For more information on what's considered appropriate
-# for your given set of circumstances, please read
-# /usr/src/gnu/usr.sbin/isdn/docs/INSTALL.  It's a bit sparse at present, but
-# it's the best we have right now.  The snic driver is also disabled at present,
-# waiting for someone to upgrade the driver to 2.0 (it's in /sys/gnu/scsi/).
-#
-device nic0 at isa? port "IO_COM3" iomem 0xe0000 tty irq 9 vector nicintr
-device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
-
 #
 # Audio drivers: `snd', `sb', `pas', `gus', `pca'
 #
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 26e5534f059..d54c1e26725 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.7 1996/08/31 07:04:04 jkh Exp $
+$Id: majors.i386,v 1.8 1996/10/10 20:41:13 phk Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
@@ -91,13 +91,13 @@ chrdev	name		comments
 51	joy		joystick
 52	tun		IP tunnel device
 53	snp		tty snoop
-54	nic		ISDN system
-55	isdn		ISDN system
-56	ity		ISDN system
-57	itel		ISDN system
+54	OLDnic		ISDN system
+55	OLDisdn		ISDN system
+56	OLDity		ISDN system
+57	OLDitel		ISDN system
 58	dgb		Digiboard
-59	ispy		ISDN system
-60	nnic		ISDN system
+59	OLDispy		ISDN system
+60	OLDnnic		ISDN system
 61	pt		SCSI "processor type"
 62	worm		SCSI "worm type"
 63	rc		Riscom/8 driver
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 91c33fe5ff4..de5d4b7c4f1 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.206 1996/09/28 22:37:33 dyson Exp $
+ *	$Id: machdep.c,v 1.207 1996/10/05 10:44:03 jkh Exp $
  */
 
 #include "npx.h"
@@ -250,12 +250,6 @@ cpu_startup(dummy)
 	 */
 	setup_netisrs(&netisr_set);
 
-/*
-#ifdef ISDN
-	DONET(isdnintr, NETISR_ISDN);
-#endif
-*/
-
 	/*
 	 * Allocate space for system data structures.
 	 * The first available kernel virtual address is in "v".
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index bc862fce0fb..af9fee28d75 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.59 1996/10/10 08:04:03 bde Exp $
+ **      $Id: userconfig.c,v 1.60 1996/10/14 21:19:43 jkh Exp $
  **/
 
 /**
@@ -260,8 +260,6 @@ static DEV_INFO device_info[] = {
 {"rc",          "RISCom/8 multiport async adapter",	0,		CLS_COMMS},
 {"cy",          "Cyclades multiport async adapter",	0,		CLS_COMMS},
 {"lpt",         "Parallel printer port",		0,		CLS_COMMS},
-{"nic",         "ISDN driver",				0,		CLS_COMMS},
-{"nnic",        "ISDN driver",				0,		CLS_COMMS},
 {"gp",          "National Instruments AT-GPIB/TNT driver",	0,	CLS_COMMS},
 
 {"mse",         "Microsoft Bus Mouse",			0,		CLS_INPUT},
@@ -2212,7 +2210,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.59 1996/10/10 08:04:03 bde Exp $
+ *      $Id: userconfig.c,v 1.60 1996/10/14 21:19:43 jkh Exp $
  */
 
 #include "scbus.h"