diff --git a/sys/arch/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X
index a3adfbad5a47..9b16fb028c9e 100644
--- a/sys/arch/sun3/conf/GENERIC3X
+++ b/sys/arch/sun3/conf/GENERIC3X
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.11 1997/10/07 17:49:26 gwr Exp $
+# $NetBSD: GENERIC3X,v 1.12 1997/10/16 17:20:41 gwr Exp $
 
 # GENERIC Sun3x (3/80, 3/470)
 # Supports root on: le0, sd*
@@ -86,6 +86,7 @@ ms0	at zsc0 channel 1	# mouse
 
 # Intel Ethernet
 ie0 at obio0 addr 0x65000000 ipl 3
+ie1 at vme2  addr   0xe88000 ipl 3 vect 0x75
 
 # Lance Ethernet (only onboard)
 le0 at obio0 addr 0x65002000 ipl 3
@@ -110,6 +111,21 @@ esp0 at obio0 addr 0x66000000 ipl 2 flags 0xff0f
 fdc0 at obio0 addr 0x6e000000 ipl 6 vect 0x40
 fd0  at fdc0	# First (and only) floppy drive.
 
+# Sun3 "si" SCSI controller (NCR 5380)
+# This driver has several flags which may be enabled using
+# the "flags" directive.  Valid flags are:
+#
+# 0x000ff	Set (1<<target) to disable disconnect/reselect
+# 0x0ff00	Set (1<<(target+8)) to disable parity checking
+# 0x10000	Set this bit to disable DMA interrupts (poll)
+# 0x20000	Set this bit to disable DMA entirely (use PIO)
+#
+# For example: "flags 0x1000f" would disable DMA interrupts,
+# and disable disconnect/reselect for targets 0-3
+# XXX: Disable DMA entirely until it is debugged.
+si0 at vme2 addr 0x200000 ipl 2 vect 0x40 flags 0x300ff
+si1 at vme2 addr 0x204000 ipl 2 vect 0x41 flags 0x300ff
+
 #
 # Frame buffer devices
 #
diff --git a/sys/arch/sun3/conf/KGDB3X b/sys/arch/sun3/conf/KGDB3X
index 3bd7f78a5366..17c31653a102 100644
--- a/sys/arch/sun3/conf/KGDB3X
+++ b/sys/arch/sun3/conf/KGDB3X
@@ -1,4 +1,4 @@
-# $NetBSD: KGDB3X,v 1.11 1997/10/07 17:49:26 gwr Exp $
+# $NetBSD: KGDB3X,v 1.12 1997/10/16 17:20:41 gwr Exp $
 
 # GENERIC Sun3x (3/80, 3/470)
 # Supports root on: le0, sd*
@@ -86,6 +86,7 @@ ms0	at zsc0 channel 1	# mouse
 
 # Intel Ethernet
 ie0 at obio0 addr 0x65000000 ipl 3
+ie1 at vme2  addr   0xe88000 ipl 3 vect 0x75
 
 # Lance Ethernet (only onboard)
 le0 at obio0 addr 0x65002000 ipl 3
@@ -110,6 +111,21 @@ esp0 at obio0 addr 0x66000000 ipl 2 flags 0xff0f
 fdc0 at obio0 addr 0x6e000000 ipl 6 vect 0x40
 fd0  at fdc0	# First (and only) floppy drive.
 
+# Sun3 "si" SCSI controller (NCR 5380)
+# This driver has several flags which may be enabled using
+# the "flags" directive.  Valid flags are:
+#
+# 0x000ff	Set (1<<target) to disable disconnect/reselect
+# 0x0ff00	Set (1<<(target+8)) to disable parity checking
+# 0x10000	Set this bit to disable DMA interrupts (poll)
+# 0x20000	Set this bit to disable DMA entirely (use PIO)
+#
+# For example: "flags 0x1000f" would disable DMA interrupts,
+# and disable disconnect/reselect for targets 0-3
+# XXX: Disable DMA entirely until it is debugged.
+si0 at vme2 addr 0x200000 ipl 2 vect 0x40 flags 0x300ff
+si1 at vme2 addr 0x204000 ipl 2 vect 0x41 flags 0x300ff
+
 #
 # Frame buffer devices
 #
diff --git a/sys/arch/sun3x/conf/GENERIC b/sys/arch/sun3x/conf/GENERIC
index 64ed53f95a56..2714c91872eb 100644
--- a/sys/arch/sun3x/conf/GENERIC
+++ b/sys/arch/sun3x/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.11 1997/10/07 17:49:26 gwr Exp $
+# $NetBSD: GENERIC,v 1.12 1997/10/16 17:20:41 gwr Exp $
 
 # GENERIC Sun3x (3/80, 3/470)
 # Supports root on: le0, sd*
@@ -86,6 +86,7 @@ ms0	at zsc0 channel 1	# mouse
 
 # Intel Ethernet
 ie0 at obio0 addr 0x65000000 ipl 3
+ie1 at vme2  addr   0xe88000 ipl 3 vect 0x75
 
 # Lance Ethernet (only onboard)
 le0 at obio0 addr 0x65002000 ipl 3
@@ -110,6 +111,21 @@ esp0 at obio0 addr 0x66000000 ipl 2 flags 0xff0f
 fdc0 at obio0 addr 0x6e000000 ipl 6 vect 0x40
 fd0  at fdc0	# First (and only) floppy drive.
 
+# Sun3 "si" SCSI controller (NCR 5380)
+# This driver has several flags which may be enabled using
+# the "flags" directive.  Valid flags are:
+#
+# 0x000ff	Set (1<<target) to disable disconnect/reselect
+# 0x0ff00	Set (1<<(target+8)) to disable parity checking
+# 0x10000	Set this bit to disable DMA interrupts (poll)
+# 0x20000	Set this bit to disable DMA entirely (use PIO)
+#
+# For example: "flags 0x1000f" would disable DMA interrupts,
+# and disable disconnect/reselect for targets 0-3
+# XXX: Disable DMA entirely until it is debugged.
+si0 at vme2 addr 0x200000 ipl 2 vect 0x40 flags 0x300ff
+si1 at vme2 addr 0x204000 ipl 2 vect 0x41 flags 0x300ff
+
 #
 # Frame buffer devices
 #
diff --git a/sys/arch/sun3x/conf/files.sun3x b/sys/arch/sun3x/conf/files.sun3x
index 64f30eb18844..3105a12996fa 100644
--- a/sys/arch/sun3x/conf/files.sun3x
+++ b/sys/arch/sun3x/conf/files.sun3x
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sun3x,v 1.21 1997/10/07 17:08:35 gwr Exp $
+#	$NetBSD: files.sun3x,v 1.22 1997/10/16 17:20:35 gwr Exp $
 
 #
 # sun3x-specific configuration info
@@ -32,6 +32,8 @@ file arch/sun3/sun3/trap.c
 file arch/sun3/sun3/vector.c
 file arch/sun3/sun3/vm_machdep.c
 
+file arch/sun3x/dev/idprom.c
+
 # include "arch/m68k/fpe/files.fpe"
 
 file arch/m68k/m68k/sig_machdep.c
@@ -61,15 +63,10 @@ device obmem {addr = -1, [ipl = -1], [vect = -1]}
 attach obmem at mainbus
 file arch/sun3x/dev/obmem.c		obmem
 
-# VME Short space (D16)
-device vmes {addr = -1, [ipl = -1], [vect = -1]}
-attach vmes at mainbus
-
-# VME Long space (D32)
-device vmel {addr = -1, [ipl = -1], [vect = -1]}
-attach vmel at mainbus
-
-file arch/sun3x/dev/vme.c		vmes | vmel
+# VME (unit encodes address/data sizes)
+device vme {addr = -1, [ipl = -1], [vect = -1]}
+attach vme at mainbus
+file arch/sun3x/dev/vme.c		vme
 
 #
 # Machine-independent SCSI drivers
@@ -91,9 +88,6 @@ file arch/sun3/dev/fb.c			# sunfb needs-flag
 #
 # On-Board I/O (OBIO)
 #
-device idprom
-attach idprom at obio
-file arch/sun3x/dev/idprom.c		idprom
 
 device memerr
 attach memerr at obio
@@ -160,31 +154,27 @@ attach cgfour at obmem
 file arch/sun3x/dev/cg4.c		cgfour needs-flag
 
 #
-# VME A16 (vmes)
+# VME
 #
 
-attach ie at vmes with ie_vmes
+attach ie at vme with ie_vmes
 file arch/sun3/dev/if_ie_vmes.c 	ie_vmes
 
-attach si at vmes with si_vmes
+attach si at vme with si_vmes
 file	arch/sun3/dev/si_vme.c		si_vmes
 
 device cgtwo: sunfb
-attach cgtwo at vmes
+attach cgtwo at vme
 file arch/sun3x/dev/cg2.c		cgtwo needs-flag
 
 device	xyc {drive = -1}
-attach	xyc at vmes
+attach	xyc at vme
 device	xy: disk
 attach	xy at xyc
 file	arch/sun3x/dev/xy.c		xy needs-flag
 
-#
-# VME A32 (vmel)
-#
-
 device	xdc {drive = -1}
-attach	xdc at vmel
+attach	xdc at vme
 device	xd: disk
 attach	xd at xdc
 file	arch/sun3x/dev/xd.c		xd needs-flag
diff --git a/sys/arch/sun3x/conf/std.sun3x b/sys/arch/sun3x/conf/std.sun3x
index f050a58ac0e8..0503f4eccd4a 100644
--- a/sys/arch/sun3x/conf/std.sun3x
+++ b/sys/arch/sun3x/conf/std.sun3x
@@ -1,4 +1,4 @@
-#	$NetBSD: std.sun3x,v 1.3 1997/05/07 02:20:28 lukem Exp $
+#	$NetBSD: std.sun3x,v 1.4 1997/10/16 17:20:38 gwr Exp $
 
 # Standard information for sun3's.
 machine	sun3x m68k
@@ -10,10 +10,13 @@ mainbus0 at root
 obio0  at mainbus?
 # main memory
 obmem0 at mainbus?
-# VME D16 space
-vmes0 at mainbus?
-# VME D32 space
-vmel0 at mainbus?
+
+# VME (one unit for each address space)
+vme0 at mainbus? # A32/D32
+vme1 at mainbus? # A24/D32
+vme2 at mainbus? # A24/D16
+vme3 at mainbus? # A16/D32
+vme4 at mainbus? # A16/D16
 
 # Devices that should be present in any Sun3x kernel.
 
@@ -21,7 +24,7 @@ vmel0 at mainbus?
 #enab0	at obio0 addr 0x61000000
 #berr0	at obio0 addr 0x61000400
 #leds0	at obio0 addr 0x61000800
-idprom0	at obio0 addr 0x61000C00	# Sun3/470
+#idprom at obio0 addr 0x61000C00	# Sun3/470
 memerr0	at obio0 addr 0x61001000
 intreg0	at obio0 addr 0x61001400
 
@@ -29,7 +32,7 @@ zsc0	at obio0 addr 0x62000000
 zsc1	at obio0 addr 0x62002000
 
 eeprom0	at obio0 addr 0x64000000
-idprom0	at obio0 addr 0x640007D8	# Sun3/80
+#idprom	at obio0 addr 0x640007D8	# Sun3/80
 
 # The clock can be either the old Intersil...
 oclock0	at obio0 addr 0x64002000 ipl 5