diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c7dd37afa10..0190c1dddc66 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-24  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+	* config.gcc (h8300-*-rtems*): Add h8300-rtemscoff.
+	Switch h8300-*-rtems* to ELF.
+
 2005-04-24  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* vec.h (VEC_safe_grow): Replace grow with safe_grow.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6dc46cc4f275..e27a9de1d7bd 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -787,10 +787,14 @@ frv-*-*linux*)
 	         linux.h frv/linux.h frv/frv-abi.h"
 	tmake_file="${tmake_file} frv/t-frv frv/t-linux"
 	;;
-h8300-*-rtems*)
+h8300-*-rtemscoff*)
 	tmake_file="h8300/t-h8300 t-rtems h8300/t-rtems"
 	tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h h8300/rtems.h rtems.h"
 	;;
+h8300-*-rtems*)
+	tmake_file="h8300/t-h8300 h8300/t-elf t-rtems h8300/t-rtems"
+	tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h"
+	;;
 h8300-*-elf*)
 	tmake_file="h8300/t-h8300 h8300/t-elf"
 	tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h"