diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7289e152af91..9ef523f73399 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-09  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+	* config/arm/t-rtems-eabi: Rename to...
+	* config/arm/t-rtems: ...this.
+	* config/arm/rtems-eabi.h: Rename to...
+	* config/arm/rtems.h: ...this.
+	* config.gcc (arm*-*-rtems*): Reflect changes above.
+
 2015-01-09  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/64410
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 857b3b0bc952..04026e38fb98 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1057,8 +1057,8 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
 	  use_gcc_stdint=wrap
 	  ;;
 	arm*-*-rtems*)
-	  tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
-	  tmake_file="${tmake_file} arm/t-bpabi arm/t-rtems-eabi"
+	  tm_file="${tm_file} rtems.h arm/rtems.h newlib-stdint.h"
+	  tmake_file="${tmake_file} arm/t-bpabi arm/t-rtems"
 	  ;;
 	arm*-*-symbianelf*)
 	  tm_file="${tm_file} arm/symbian.h"
diff --git a/gcc/config/arm/rtems-eabi.h b/gcc/config/arm/rtems.h
similarity index 100%
rename from gcc/config/arm/rtems-eabi.h
rename to gcc/config/arm/rtems.h
diff --git a/gcc/config/arm/t-rtems-eabi b/gcc/config/arm/t-rtems
similarity index 100%
rename from gcc/config/arm/t-rtems-eabi
rename to gcc/config/arm/t-rtems