diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8038b5c675..7433411953 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2002-08-18  Andrew Cagney  <ac131313@redhat.com>
+
+	* MAINTAINERS (Target Instruction Set Architectures): Rename
+	Target/Architectures.  Replace vax-dec-vms5.5 with vax-netbsd.
+	Replace s390-linux with s390-linux-gnu.  Remove i386-aout,
+	mcore-pe, mips64-elf, sparc64-elf.  Remove i586-pc-msdosdjgpp,
+	already listed under Host/Native.
+
+	* configure.tgt: Combine i[3456]86-*-coff*, i[3456]86-*-elf*,
+	i[3456]86-*-pe*, and i[3456]86-*-aout* into i[3456]86-*-*.  Add
+	mips*-*-*.
+
 2002-08-17  Andrew Cagney  <ac131313@redhat.com>
 
 	* config/ia64/ia64.mt: New file.
@@ -602,7 +614,7 @@
 
 2002-08-05  Theodore A. Roth  <troth@verinet.com>
 
-	* gdb/avr-tdep.c(avr_skip_prologue): Fix to return the correct pc.
+	* avr-tdep.c (avr_skip_prologue): Fix to return the correct pc.
 
 2002-08-05  Andrew Cagney  <ac131313@redhat.com>
 
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 6348a93a41..89eeae8476 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -47,7 +47,7 @@ fix, since such a change without discussion will result in
 instantaneous and loud complaints.
 
 
-Target/Architecture:
+Target Instruction Set Architectures:
 
 Generic ISA (Instruction Set Architecture) issues, API variants, CPU
 variants.  *-tdep.c. The Target/Architecture maintainer works with the
@@ -78,9 +78,6 @@ maintainer works with the native maintainer when resolving API issues.
 
 	d30v		(--target=d30v-elf OBSOLETE)
 
-	djgpp		--target=i586-pc-msdosdjgpp ,-Werror
-			(See native and host)
-
 	fr30		(--target=fr30-elf OBSOLETE)
 
 	h8300		--target=h8300hms -Werror
@@ -91,7 +88,7 @@ maintainer works with the native maintainer when resolving API issues.
 			Maintenance only
 			Not multi-arch, work in progress
 
-	i386		--target=i386-elf,i386-aout ,-Werror
+	i386		--target=i386-elf ,-Werror
 			Mark Kettenis           kettenis@gnu.org
 
 	i960		--target=i960-coff ,-Werror
@@ -114,10 +111,10 @@ maintainer works with the native maintainer when resolving API issues.
 
 	m88k		(--target=m88k OBSOLETE)
 
-	mcore		--target=mcore-elf,mcore-pe ,-Werror
+	mcore		--target=mcore-elf ,-Werror
 			Maintenance only
 
-	mips		--target=mips-elf,mips64-elf ,-Werror
+	mips		--target=mips-elf ,-Werror
 			Andrew Cagney		cagney@redhat.com
 
 	mn10200		--target=mn10200-elf ,-Werror
@@ -143,7 +140,7 @@ maintainer works with the native maintainer when resolving API issues.
 	sh		--target=sh-elf ,-Werror
 			Elena Zannoni		ezannoni@redhat.com
 
-	sparc		--target=sparc-elf,sparc64-elf ,-Werror
+	sparc		--target=sparc-elf ,-Werror
 			Maintenance only
 
 	tic80		Deleted.
@@ -151,7 +148,7 @@ maintainer works with the native maintainer when resolving API issues.
 	v850		--target=v850-elf ,-Werror
 			Maintenance only
 
-	vax		--target=vax-dec-vms5.5 ,-Werror
+	vax		--target=vax-netbsd ,-Werror
 			Maintenance only
 
 	w65		Deleted.
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index eef88f6627..999e2c8bc6 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -88,9 +88,6 @@ i[3456]86-sequent-bsd*)	gdb_target=symmetry ;;
 i[3456]86-sequent-sysv4*) gdb_target=ptx4 ;;
 i[3456]86-sequent-sysv*) gdb_target=ptx ;;
 i[3456]86-ncr-*)	gdb_target=ncr3000 ;;
-i[3456]86-*-aout*)	gdb_target=embed ;;
-i[3456]86-*-coff*)	gdb_target=embed ;;
-i[3456]86-*-elf*)	gdb_target=embed ;;
 # OBSOLETE i[3456]86-*-aix*)	gdb_target=i386aix ;;
 i[3456]86-*-bsd*)	gdb_target=i386bsd ;;
 i[3456]86-*-freebsd*)	gdb_target=fbsd ;;
@@ -119,8 +116,8 @@ i[3456]86-*-netware*)	gdb_target=i386nw
 		configdirs="${configdirs} nlm" ;;
 i[3456]86-*-osf1mk*)	gdb_target=i386mk ;;
 i[3456]86-*-cygwin*)	gdb_target=cygwin  ;;
-i[3456]86-*-pe*)	gdb_target=embed  ;;
 i[3456]86-*-vxworks*)	gdb_target=vxworks ;;
+i[3456]86-*-*)		gdb_target=embed ;;
 
 i960-*-bout*)		gdb_target=vxworks960 ;;
 i960-nindy-coff*)	gdb_target=nindy960 ;;
@@ -210,6 +207,7 @@ mips*-*-sysv4*)		gdb_target=mipsv4 ;;
 mips*-*-sysv*)		gdb_target=bigmips ;;
 mips*-*-riscos*)	gdb_target=bigmips ;;
 mips*-*-vxworks*)       gdb_target=vxmips ;;
+mips*-*-*)		gdb_target=embed ;;
 
 mn10200-*-*)		gdb_target=mn10200 ;;
 mn10300-*-*)		gdb_target=mn10300 ;;