diff --git a/c/src/lib/libbsp/mips/hurricane/ChangeLog b/c/src/lib/libbsp/mips/hurricane/ChangeLog
index 44f725cae7..b0d5cfba76 100644
--- a/c/src/lib/libbsp/mips/hurricane/ChangeLog
+++ b/c/src/lib/libbsp/mips/hurricane/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* liblnk/regs.S: Remove (Renamed into liblnk/regs.h).
+	* liblnk/regs.h: New (Renamed from liblnk/regs.S).
+	* Makefile.am, liblnk/pmon.S: Reflect renamer.
+
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate *_SOURCES.
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index cb74ee49e3..45b57eb916 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -21,7 +21,7 @@ DISTCLEANFILES = include/bspopts.h
 
 nodist_include_HEADERS += ../../shared/include/coverhd.h
 
-EXTRA_DIST = start/start.S start/regs.S
+EXTRA_DIST = start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 
@@ -46,7 +46,7 @@ libbsp_a_SOURCES += clock/ckinit.c
 # console
 libbsp_a_SOURCES += console/console.c
 # liblnk
-libbsp_a_SOURCES += liblnk/lnklib.S liblnk/pmon.S
+libbsp_a_SOURCES += liblnk/lnklib.S liblnk/pmon.S liblnk/regs.h
 
 libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
diff --git a/c/src/lib/libbsp/mips/hurricane/liblnk/pmon.S b/c/src/lib/libbsp/mips/hurricane/liblnk/pmon.S
index b84771bb74..bbf2c046b8 100644
--- a/c/src/lib/libbsp/mips/hurricane/liblnk/pmon.S
+++ b/c/src/lib/libbsp/mips/hurricane/liblnk/pmon.S
@@ -29,7 +29,7 @@
   #define SUBU dsubu
 #endif
 
-#include "regs.S"
+#include "regs.h"
 
 	.text
 	.align	2
diff --git a/c/src/lib/libbsp/mips/hurricane/liblnk/regs.S b/c/src/lib/libbsp/mips/hurricane/liblnk/regs.h
similarity index 100%
rename from c/src/lib/libbsp/mips/hurricane/liblnk/regs.S
rename to c/src/lib/libbsp/mips/hurricane/liblnk/regs.h
diff --git a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog
index 311c362e24..dfdd3b8358 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog
+++ b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* liblnk/regs.S: Remove (Renamed into liblnk/regs.h).
+	* liblnk/regs.h: New (Renamed from liblnk/regs.S).
+	* Makefile.am, liblnk/pmon.S: Reflect renamer.
+
 2008-09-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate *_SOURCES.
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index a28af12c01..2d36df8e54 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -22,7 +22,7 @@ noinst_PROGRAMS =
 
 nodist_include_HEADERS += ../../shared/include/coverhd.h
 
-EXTRA_DIST = start/start.S start/regs.S
+EXTRA_DIST = start/start.S
 start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 
@@ -54,7 +54,7 @@ clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 libbsp_a_SOURCES += console/console-io.c
 
 # liblnk
-libbsp_a_SOURCES += liblnk/lnklib.S liblnk/pmon.S
+libbsp_a_SOURCES += liblnk/lnklib.S liblnk/pmon.S liblnk/regs.h
 
 libbsp_a_LIBADD = \
     clock.rel \
diff --git a/c/src/lib/libbsp/mips/rbtx4925/liblnk/pmon.S b/c/src/lib/libbsp/mips/rbtx4925/liblnk/pmon.S
index b84771bb74..bbf2c046b8 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/liblnk/pmon.S
+++ b/c/src/lib/libbsp/mips/rbtx4925/liblnk/pmon.S
@@ -29,7 +29,7 @@
   #define SUBU dsubu
 #endif
 
-#include "regs.S"
+#include "regs.h"
 
 	.text
 	.align	2
diff --git a/c/src/lib/libbsp/mips/rbtx4925/liblnk/regs.S b/c/src/lib/libbsp/mips/rbtx4925/liblnk/regs.h
similarity index 100%
rename from c/src/lib/libbsp/mips/rbtx4925/liblnk/regs.S
rename to c/src/lib/libbsp/mips/rbtx4925/liblnk/regs.h