diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index 7425e8bc2294..00e3a63390fd 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,11 +1,11 @@
-#	$NetBSD: DRACO,v 1.20 1997/12/01 15:17:09 kleink Exp $
+#	$NetBSD: DRACO,v 1.21 1998/02/05 20:07:17 is Exp $
 
 #
 # Macro System GmbH "DraCo", currently 68060-only until FPE is integrated.
 #
 
 # this will be replace by std.amiga soon:
-include "arch/amiga/conf/std.draco"
+include "arch/amiga/conf/std.amiga"
 
 maxusers	8
 options 	RTC_OFFSET=0
@@ -34,6 +34,7 @@ options 	INET		# IP networking support (Required)
 #options 	GATEWAY		# Packet forwarding
 #options 	DIRECTED_BROADCAST	# Broadcast across subnets
 #options 	NSIP		# XNS over IP
+#options	MROUTING
 
 #
 # File system related options
@@ -163,5 +164,6 @@ pseudo-device	loop			# network loopback
 pseudo-device	bpfilter 2		# berkeley packet filters
 pseudo-device	tun 2
 pseudo-device	ppp 2			# ppp protocol network drivers
+pseudo-device	vnd 4			# pseudo disk on file
 
 config	netbsd root on ? type ?
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 9713aa34e0e0..c0412f2cdf0f 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.97 1997/12/01 15:17:11 kleink Exp $
+#	$NetBSD: GENERIC,v 1.98 1998/02/05 20:07:15 is Exp $
 
 #
 # GENERIC AMIGA
@@ -204,15 +204,32 @@ hyper*		at zbus?		# zbus HyperCom3 + HyperCom4
 com*		at hyper? port ?	# Hypercom3/4 serial ports
 #lpt*		at hyper? port ?	# not yet: Hypercom3 parallel port
 
+#
+# Amiga Mainboard devices (sans graphics and keyboard)
+#
+
+ser0		at mainbus0		# Amiga onboard serial
+par0		at mainbus0		# Amiga onboard parallel
+ms*		at mainbus0		# Amiga mice
+fdc0		at mainbus0		# Amiga FDC
+fd*		at fdc0 unit ?		# floppy disks on the later
+a34kbbc0	at mainbus0		# A3000/A4000 battery backed clock
+a2kbbc0 	at mainbus0		# A2000 battery backed clock
+aucc*		at mainbus0		# Amiga CC audio
+audio*		at aucc?
+
+#
+# DraCo Mainboard devices (sans keyboard)
+#
+
 drbbc0		at mainbus0		# DraCo battery backed clock
 drsupio0	at mainbus0		# DraCo superio chip
 com*		at drsupio? port ?	# DraCo serial
 lpt0		at drsupio? port ?	# DraCo parallel
 
-a2kbbc0 	at mainbus0		# A2000 battery backed clock
-a34kbbc0	at mainbus0		# A3000/A4000 battery backed clock
-aucc*		at mainbus0		# Amiga CC audio
-audio*		at aucc?
+#
+# Zorro-II, Zorro-III, DraCo Direct-Bus devices (sans graphics)
+#
 
 melody* 	at zbus0		# Melody MPEG audio decoder
 audio*		at melody?
diff --git a/sys/arch/amiga/conf/std.amiga b/sys/arch/amiga/conf/std.amiga
index db048422d24f..657b4397f432 100644
--- a/sys/arch/amiga/conf/std.amiga
+++ b/sys/arch/amiga/conf/std.amiga
@@ -1,4 +1,4 @@
-#	$NetBSD: std.amiga,v 1.11 1997/11/17 01:57:29 lukem Exp $
+#	$NetBSD: std.amiga,v 1.12 1998/02/05 20:07:18 is Exp $
 
 # standard amiga information
 
@@ -7,12 +7,7 @@ machine amiga m68k
 mainbus0	at root
 
 clock0	at mainbus0
-ser0	at mainbus0
-par0	at mainbus0
 kbd0	at mainbus0
-ms*	at mainbus0
-fdc0	at mainbus0
-fd*	at fdc0 unit ?
 zbus0	at mainbus0
 
 options 	SWAPPAGER	# paging
diff --git a/sys/arch/amiga/conf/std.draco b/sys/arch/amiga/conf/std.draco
deleted file mode 100644
index 35c8589950b7..000000000000
--- a/sys/arch/amiga/conf/std.draco
+++ /dev/null
@@ -1,18 +0,0 @@
-#	$NetBSD: std.draco,v 1.3 1997/11/17 01:57:30 lukem Exp $
-
-# standard amiga information
-
-machine amiga m68k
-
-mainbus0	at root
-
-clock0	at mainbus0
-kbd0	at mainbus0
-zbus0	at mainbus0
-
-options 	SWAPPAGER	# paging
-options 	VNODEPAGER	# mmap() of files
-options 	DEVPAGER	# mmap() of devices
-
-options 	EXEC_AOUT
-options 	EXEC_SCRIPT