diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6e004e60e0..f5879a68ba 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-29  Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* configure.tgt: Add h8300*-*-rtemscoff.
+	Switch h8300*-*-rtems* to elf.
+
 2005-04-29  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* hash.c: Undo the last change.
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 58604990f4..6d4ea61f1d 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -161,9 +161,9 @@ case ${generic_target} in
   hppa-*-bsd*)				fmt=som em=hppa ;;
   hppa-*-hiux*)				fmt=som em=hppa ;;
 
-  h8300-*-rtems*)			fmt=coff ;;
+  h8300-*-rtemscoff*)			fmt=coff ;;
   h8300-*-coff)				fmt=coff ;;
-  h8300-*-elf)				fmt=elf ;;
+  h8300-*-elf | h8300-*-rtems*)		fmt=elf ;;
   h8500-*-rtems*)			fmt=coff ;;
   h8500-*-coff)				fmt=coff ;;
 
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 80536ca603..932ab56002 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-29  Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* configure.tgt: Add h8300*-*-rtemscoff.
+	Switch h8300*-*-rtems* to elf.
+
 2005-04-29  Ben Elliston  <bje@au.ibm.com>
 
 	* ldgram.y (lang_memory_region_type): Make static.
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 7764b096b5..a83a087e82 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -284,10 +284,10 @@ thumb-*-pe)		targ_emul=armpe ;
 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 xscale-*-coff)		targ_emul=armcoff ;;
 xscale-*-elf)		targ_emul=armelf ;;
-h8300-*-hms* | h8300-*-coff* | h8300-*-rtems*)
+h8300-*-hms* | h8300-*-coff* | h8300-*-rtemscoff*)
 			targ_emul=h8300; targ_extra_emuls="h8300h h8300s h8300hn h8300sn h8300sx h8300sxn"
 			;;
-h8300-*-elf*)
+h8300-*-elf* | h8300-*-rtems*)
 			targ_emul=h8300elf;
 			targ_extra_emuls="h8300helf h8300self h8300hnelf h8300snelf h8300sxelf h8300sxnelf"
 			;;