diff --git a/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog
index 45b6d0a9cf..9e6c2dc4f8 100644
--- a/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog
+++ b/c/src/lib/libbsp/mips/jmr3904/tools/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: install runtest to bsptools_bindir.
+
 2003-08-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reflect having moved aclocal/.
diff --git a/c/src/lib/libbsp/mips/jmr3904/tools/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/tools/Makefile.am
index a824332c1e..6b0598e64e 100644
--- a/c/src/lib/libbsp/mips/jmr3904/tools/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/tools/Makefile.am
@@ -4,18 +4,22 @@
 
 ACLOCAL_AMFLAGS = -I ../../../../../aclocal
 
-noinst_SCRIPTS = runtest
-
-TMPINSTALL_FILES = $(PROJECT_ROOT)/jmr3904/tests \
-    $(PROJECT_ROOT)/jmr3904/tests/runtest 
-
-$(PROJECT_ROOT)/jmr3904/tests:
-	$(mkinstalldirs) $@
-
-$(PROJECT_ROOT)/jmr3904/tests/runtest: runtest
-	$(INSTALL_SCRIPT) $< $@
+transform =
+bsptools_bindir = ${exec_prefix}/@RTEMS_BSP@/tests
+bsptools_bin_SCRIPTS = runtest
 
 ## HACK: install to build-tree
 all-local: $(TMPINSTALL_FILES)
 
+TMPINSTALL_FILES =
+
+$(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/tests
+	@: > $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+
+$(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest: runtest $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp)
+	$(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest
+TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest
+
 include $(top_srcdir)/../../../../../automake/host.am