diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index accba02095739e9d2b85efab3972b6db869a85d7..0dc881d6f769d3078d5aa414ce9f11e6686d03b2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-21  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+	* config.bfd: Remove i[3-7]86-*-rtemself*.
+	Remove sparc-*-rtemself*.
+
 2005-07-22  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
 
 	* elf32-m32r.c (m32r_elf_check_relocs): Fix pc count for
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 97ae09e733c37450bdc668550fe9b8ca1c8f0aa6..2fe741b0404e9cc31ee410091b6d9727a9a7e185 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -483,7 +483,7 @@ case "${targ}" in
   i[3-7]86-*-aix*)
     targ_defvec=i386coff_vec
     ;;
-  i[3-7]86-*-rtemself* | i[3-7]86-*-rtems*)
+  i[3-7]86-*-rtems*)
     targ_defvec=bfd_elf32_i386_vec
     targ_selvecs="i386coff_vec i386aout_vec"
     ;;
@@ -1298,11 +1298,11 @@ case "${targ}" in
   sparc*-*-coff*)
     targ_defvec=sparccoff_vec
     ;;
-  sparc*-*-rtems* | sparc*-*-rtemself*)
+  sparc*-*-rtems*)
     targ_defvec=bfd_elf32_sparc_vec
     targ_selvecs="sunos_big_vec sparccoff_vec"
     ;;
-  sparc*-*-* | sparc*-*-rtems*)
+  sparc*-*-*)
     targ_defvec=sunos_big_vec
     targ_underscore=yes
     ;;
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 53b6d27b7052898d4ddaad2804d2d92731d9cb4b..409349ae31e0ea11cff7a691c70a8995324efb1e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-21  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+	* configure.tgt: Remove i386-*-rtemself*.
+	Remove sparc-*-rtemself*.
+
 2005-07-21  Ben Elliston  <bje@gnu.org>
 
 	* config/tc-m68k.h: Remove TE_LYNX conditional code.
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 0311d061e44418fe1ac70f0ba44afeb374d34d52..bd98d83540656fa21633b033a34fe55aeca04c78 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -210,7 +210,6 @@ case ${generic_target} in
   i386-*-vsta)				fmt=aout ;;
   i386-*-msdosdjgpp* \
   | i386-*-go32*)			fmt=coff em=go32 ;;
-  i386-*-rtemself*)			fmt=elf ;;
   i386-*-rtems*)			fmt=elf ;;
   i386-*-gnu*)				fmt=elf ;;
   i386-*-mach*)				fmt=aout em=mach ;;
@@ -364,7 +363,6 @@ case ${generic_target} in
   shle*-*-kaos*)			fmt=elf ;;
   sh64-*-elf*)				fmt=elf ;;
 
-  sparc-*-rtemself*)			fmt=elf ;;
   sparc-*-rtems*)			fmt=elf ;;
   sparc-*-sunos4*)			fmt=aout em=sun3 ;;
   sparc-*-aout | sparc*-*-vxworks*)	fmt=aout em=sparcaout ;;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index ce8abcd88f3283f1055aa002be008a390a54c706..09f6bdc0af637c731814d0b20a5611679c0760ac 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-21  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+	* configure.tgt: Remove i[3-7]86-*-rtemself*.
+	Remove sparc-*-rtemself*.
+
 2005-07-21  Ben Elliston  <bje@gnu.org>
 
 	* ldgram.y (ldgram_want_filename): Remove unused static.
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 1c15ab65cce82fa4f7080aa5c6dddbea4fb81d19..62ad634261ba5a8cd55ec63e9ea00e7c4237096c 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -140,7 +140,6 @@ i[3-7]86-*-sco*)	targ_emul=i386coff ;;
 i[3-7]86-*-isc*)	targ_emul=i386coff ;;
 i[3-7]86-*-lynxos*)	targ_emul=i386lynx ;;
 i[3-7]86-*-coff)	targ_emul=i386coff ;;
-i[3-7]86-*-rtemself*)	targ_emul=elf_i386 ;;
 i[3-7]86-*-rtems*)	targ_emul=elf_i386 ;;
 i[3-7]86-*-aros*)	targ_emul=elf_i386 ;;
 i[3-7]86-*-bsd)		targ_emul=i386bsd ;;
@@ -532,7 +531,6 @@ sparcv9-*-solaris2* | sparc64-*-solaris2*)
 			tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'` ;;
 sparc*-*-solaris2*)	targ_emul=elf32_sparc ;;
 sparc*-wrs-vxworks*)	targ_emul=sparcaout ;;
-sparc*-*-rtemself*)     targ_emul=elf32_sparc ;;
 sparc*-*-rtems*)        targ_emul=elf32_sparc
 			;;
 tic30-*-*aout*)		targ_emul=tic30aout ;;