diff --git a/etc/etc.sgimips/Makefile.inc b/etc/etc.sgimips/Makefile.inc
index 3128a02e7dd0..28cf48a94dc5 100644
--- a/etc/etc.sgimips/Makefile.inc
+++ b/etc/etc.sgimips/Makefile.inc
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.4 2002/05/08 12:17:47 jdolecek Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2002/05/13 01:27:01 soren Exp $
 #
 #	etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
 #
 
-KERNEL_SETS=		GENERIC_INDY
+KERNEL_SETS=		GENERIC GENERIC_INDY
 
 BUILD_KERNELS=		RAMDISK
 
diff --git a/sys/arch/sgimips/conf/DRAKEN b/sys/arch/sgimips/conf/GENERIC
similarity index 97%
rename from sys/arch/sgimips/conf/DRAKEN
rename to sys/arch/sgimips/conf/GENERIC
index 0eb048b7fadc..357f11dc316f 100644
--- a/sys/arch/sgimips/conf/DRAKEN
+++ b/sys/arch/sgimips/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: DRAKEN,v 1.1 2002/05/08 13:52:17 pooka Exp $
+#	$NetBSD: GENERIC,v 1.1 2002/05/13 01:26:27 soren Exp $
 #
 # O2
 
diff --git a/sys/arch/sgimips/conf/GENERIC_INDY b/sys/arch/sgimips/conf/GENERIC_INDY
index f6075985737c..c5931de168f0 100644
--- a/sys/arch/sgimips/conf/GENERIC_INDY
+++ b/sys/arch/sgimips/conf/GENERIC_INDY
@@ -1,5 +1,96 @@
-#	$NetBSD: GENERIC_INDY,v 1.4 2001/11/22 01:11:51 soren Exp $
+#	$NetBSD: GENERIC_INDY,v 1.5 2002/05/13 01:26:27 soren Exp $
+#
+# Indy
 
-include		"arch/sgimips/conf/GENERIC"
+include		"arch/sgimips/conf/std.sgimips"
 
-makeoptions	TEXTADDR="0x88069000"
+#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
+
+# XXX _LOW _HOW og/eller TEXTADDR
+
+#makeoptions	TEXTADDR=0x80069000	# O2
+makeoptions	TEXTADDR=0x88069000	# Indy
+#makeoptions	TEXTADDR=0x8001c000	# IP27
+#makeoptions	TEXTADDR=0x80300000	# IP27 Symmon
+
+maxusers	32
+
+#options 	SYSCALL_DEBUG
+#options 	PARANOIADIAG
+
+#options 	PCI_CONFIG_DUMP
+
+options 	SCSI_DELAY=0
+
+options 	IP32			# this is required for an O2
+
+#options 	MIPS1
+options 	MIPS3
+options 	MIPS3_L2CACHE_ABSENT
+#options 	MIPS3_L2CACHE_PRESENT
+options 	MIPS3_5200		# XXX
+
+#options 	MEMORY_DISK_HOOKS
+#options 	MEMORY_DISK_IS_ROOT
+#options 	MEMORY_DISK_SERVER=0
+#options 	MEMORY_DISK_ROOT_SIZE=8192
+
+options 	KTRACE
+#options 	USERCONF	# userconf(4) support
+#options	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
+
+options 	DDB
+options 	DDB_HISTORY_SIZE=100
+options 	DEBUG
+options 	DIAGNOSTIC
+#makeoptions	DEBUG="-g"
+
+#options 	EXEC_ECOFF
+
+file-system	FFS
+file-system	NFS
+file-system	MFS
+#file-system	KERNFS
+#file-system	PROCFS
+
+options 	SOFTDEP
+
+options 	FFS_EI
+
+options 	INET
+
+options 	SCSIVERBOSE
+
+options 	NFS_BOOT_DHCP
+#options 	NFS_BOOT_BOOTPARAM
+
+config		netbsd		root on ? type ?
+
+mainbus0 	at root
+cpu0 		at mainbus0
+
+# Indy
+imc0 		at mainbus0 addr 0x1fa00000
+gio0 		at imc0
+eisa0 		at imc0
+
+hpc0 		at gio? addr 0x1fb80000
+hpc1 		at gio? addr 0x1fb00000
+hpc2 		at gio? addr 0x1f980000
+sq0 		at hpc0 # net 0
+sbic0 		at hpc0 # hd 0
+sbic1 		at hpc0 # hd 1
+
+zsc* 		at hpc0 # pbus0 device ?
+zstty*		at zsc? channel ?
+
+pbus0 		at hpc0
+
+pckbc0  	at pbus0 device ?
+
+pseudo-device	loop
+pseudo-device	pty
+pseudo-device	bpfilter	8
+pseudo-device	vnd		4
+#pseudo-device	md		1
+pseudo-device	rnd
diff --git a/sys/arch/sgimips/conf/INDY b/sys/arch/sgimips/conf/INDY
deleted file mode 100644
index a56a1c0ac5cf..000000000000
--- a/sys/arch/sgimips/conf/INDY
+++ /dev/null
@@ -1,97 +0,0 @@
-#	$NetBSD: INDY,v 1.18 2002/05/08 13:52:17 pooka Exp $
-#
-# Indy
-
-include		"arch/sgimips/conf/std.sgimips"
-
-#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
-
-# XXX _LOW _HOW og/eller TEXTADDR
-
-#makeoptions	TEXTADDR=0x80069000	# O2
-makeoptions	TEXTADDR=0x88069000	# Indy
-#makeoptions	TEXTADDR=0x8001c000	# IP27
-#makeoptions	TEXTADDR=0x80300000	# IP27 Symmon
-
-maxusers	32
-
-#options 	SYSCALL_DEBUG
-#options 	PARANOIADIAG
-
-#options 	PCI_CONFIG_DUMP
-
-options 	SCSI_DELAY=0
-
-options 	IP32			# this is required for an O2
-
-#options 	MIPS1
-options 	MIPS3
-options 	MIPS3_L2CACHE_ABSENT
-#options 	MIPS3_L2CACHE_PRESENT
-options 	MIPS3_5200		# XXX
-
-#options 	MEMORY_DISK_HOOKS
-#options 	MEMORY_DISK_IS_ROOT
-#options 	MEMORY_DISK_SERVER=0
-#options 	MEMORY_DISK_ROOT_SIZE=8192
-
-options 	KTRACE
-#options 	USERCONF	# userconf(4) support
-#options	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
-
-options 	DDB
-options 	DDB_HISTORY_SIZE=100
-options 	DEBUG
-options 	DIAGNOSTIC
-#makeoptions	DEBUG="-g"
-
-#options 	EXEC_ECOFF
-
-file-system	FFS
-file-system	NFS
-file-system	MFS
-#file-system	KERNFS
-#file-system	PROCFS
-
-options 	SOFTDEP
-
-options 	FFS_EI
-
-options 	INET
-
-options 	SCSIVERBOSE
-
-options 	NFS_BOOT_DHCP
-#options 	NFS_BOOT_BOOTPARAM
-
-config		netbsd		root on ? type ?
-
-mainbus0 	at root
-cpu0 		at mainbus0
-
-# Indy
-imc0 		at mainbus0 addr 0x1fa00000
-gio0 		at imc0
-eisa0 		at imc0
-
-hpc0 		at gio? addr 0x1fb80000
-hpc1 		at gio? addr 0x1fb00000
-hpc2 		at gio? addr 0x1f980000
-sq0 		at hpc0 # net 0
-sbic0 		at hpc0 # hd 0
-sbic1 		at hpc0 # hd 1
-
-zsc* 		at hpc0 # pbus0 device ?
-zstty*		at zsc? channel ?
-
-pbus0 		at hpc0
-
-pckbc0  	at pbus0 device ?
-
-
-pseudo-device	loop
-pseudo-device	pty
-pseudo-device	bpfilter	8
-pseudo-device	vnd		4
-#pseudo-device	md		1
-pseudo-device	rnd
diff --git a/sys/arch/sgimips/conf/TEAL b/sys/arch/sgimips/conf/TEAL
deleted file mode 100644
index 0209ba06400e..000000000000
--- a/sys/arch/sgimips/conf/TEAL
+++ /dev/null
@@ -1,91 +0,0 @@
-#	$NetBSD: TEAL,v 1.10 2002/04/25 15:06:36 atatat Exp $
-
-include		"arch/sgimips/conf/std.sgimips"
-
-#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
-
-makeoptions	TEXTADDR=0x88069000	# Indy/Indigo2
-
-maxusers	32
-
-options 	SCSI_DELAY=5
-
-options 	MIPS3
-options 	MIPS3_L2CACHE_ABSENT
-#options 	MIPS3_L2CACHE_PRESENT
-
-options 	KTRACE
-options 	SYSVMSG			# System V message queues
-options 	SYSVSEM			# System V semaphores
-options 	SYSVSHM			# System V shared memory
-
-options 	PARANOIADIAG
-
-options 	DDB
-options 	DDB_HISTORY_SIZE=100
-options 	DEBUG
-options 	DIAGNOSTIC
-
-#options 	KGDB
-#options 	KGDB_DEV=0x2301		# KGDB port - this is Serial(1)
-#options 	KGDB_DEVRATE=19200	# KGDB Baud Rate
-
-#makeoptions	DEBUG="-g"
-
-file-system	FFS
-file-system	NFS
-file-system	KERNFS
-file-system	PROCFS
-file-system	CD9660		# ISO 9660 + Rock Ridge file system
-
-options 	FFS_EI
-options 	SOFTDEP
-
-options 	INET
-
-options 	SCSIVERBOSE
-
-options 	NFS_BOOT_DHCP
-#options 	NFS_BOOT_BOOTPARAM
-
-options 	IP22
-
-config		netbsd		root on ? type ?
-
-mainbus0 	at root
-cpu0 		at mainbus0
-
-imc0 		at mainbus0 addr 0x1fa00000
-gio0 		at imc0
-eisa0 		at imc0
-
-hpc0 		at gio? addr 0x1fb80000
-hpc1 		at gio? addr 0x1fb00000
-hpc2 		at gio? addr 0x1f980000
-
-sq* 		at hpc0 offset ?
-wdsc* 		at hpc0 offset ?
-dsclock*	at hpc0 offset ?
-
-#
-# As always, the zs chip is wired funny, so channel 1 is actually the
-# first serial port and channel 0 is the second.
-#
-zsc* 		at hpc0 offset ? # pbus0 device ?
-zstty*		at zsc? channel ?
-
-#pbus0 		at hpc0
-
-#pckbc0 	at pbus0 device ?
-
-scsibus* at wdsc?
-sd*	at scsibus? target ? lun ?	# SCSI disks
-st*	at scsibus? target ? lun ?	# SCSI tapes
-cd*	at scsibus? target ? lun ?	# SCSI CD-ROMs
-ch*	at scsibus? target ? lun ?	# SCSI changer devices
-
-pseudo-device	loop
-pseudo-device	pty
-pseudo-device	bpfilter	8
-#pseudo-device	md		1
-pseudo-device	rnd			# /dev/random and in-kernel generator