diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 4b111ad786..01f4ad226d 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -70,8 +70,6 @@ project_lib_DATA = start.$(OBJEXT)
 project_lib_DATA += startup/linkcmds
 project_lib_DATA += ../shared/startup/linkcmds.base
 
-EXTRA_DIST = startup/linkcmds
-
 ###############################################################################
 # LibBSP                                                     #
 ###############################################################################
diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
index ecaee3de6a..48bd62cbf4 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac
+++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
@@ -41,7 +41,8 @@ RTEMS_BSPOPTS_HELP([BSP_IS_RPI2],[Set if the BSP variant is Raspberry Pi 2.])
 AM_CONDITIONAL(RTEMS_RPI2,[test "$BSP_IS_RPI2" = "1"])
 
 RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
-RTEMS_BSP_LINKCMDS
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([
+Makefile
+startup/linkcmds])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds b/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in
similarity index 100%
rename from c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds
rename to c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in