diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e867fbe56ee..4ee74eb1633 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-23  Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* config/arm/t-rtems: New.
+	* config.gcc: Reflect having added arm/t-rtems.
+
 2004-11-23  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* tree-cfg.c (tree_execute_on_growing_pred): New.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 14b9a28b4d2..edff65639d7 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -675,7 +675,7 @@ arm*-*-eabi* | arm*-*-symbianelf* )
 	;;
 arm*-*-rtems*)
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h"
-	tmake_file="arm/t-arm arm/t-arm-elf t-rtems"
+	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
 	;;
 arm*-*-elf | ep9312-*-elf)
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
diff --git a/gcc/config/arm/t-rtems b/gcc/config/arm/t-rtems
new file mode 100644
index 00000000000..52d14bab08f
--- /dev/null
+++ b/gcc/config/arm/t-rtems
@@ -0,0 +1,10 @@
+# Custom rtems multilibs
+
+MULTILIB_OPTIONS     = marm/mthumb
+MULTILIB_DIRNAMES    = arm thumb
+MULTILIB_EXCEPTIONS  = 
+MULTILIB_MATCHES     = marm=mno-thumb
+
+MULTILIB_OPTIONS    += msoft-float/mhard-float
+MULTILIB_DIRNAMES   += soft fpu
+MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*