diff --git a/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c b/bsps/m68k/mcf5206elite/dev/ckinit.c
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c
rename to bsps/m68k/mcf5206elite/dev/ckinit.c
diff --git a/c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c b/bsps/m68k/mcf5206elite/dev/mcfmbus.c
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/mbus/mcfmbus.c
rename to bsps/m68k/mcf5206elite/dev/mcfmbus.c
diff --git a/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c b/bsps/m68k/mcf5206elite/dev/mcfuart.c
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c
rename to bsps/m68k/mcf5206elite/dev/mcfuart.c
diff --git a/c/src/lib/libcpu/m68k/mcf5206/timer/timer.c b/bsps/m68k/mcf5206elite/dev/timer.c
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/timer/timer.c
rename to bsps/m68k/mcf5206elite/dev/timer.c
diff --git a/c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S b/bsps/m68k/mcf5206elite/dev/timerisr.S
similarity index 100%
rename from c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S
rename to bsps/m68k/mcf5206elite/dev/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index eeee5add77..47f98c6e0e 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -46,12 +46,11 @@ libbsp_a_SOURCES += nvram/nvram.c
 libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 libbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/m68kidle.c
 libbsp_a_SOURCES += ../../../../../../bsps/m68k/shared/memProbe.c
-
-libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/mcfuart.rel \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/ckinit.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/mcfmbus.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/mcfuart.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/timer.c
+libbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/dev/timerisr.S
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/m68k/mcf5206elite/headers.am
diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 1b28e60d73..50cc126be0 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -4,33 +4,6 @@ include $(top_srcdir)/../../../automake/compile.am
 
 noinst_PROGRAMS =
 
-if mcf5206
-# mcf5206/include
-## mcf5206/clock
-noinst_PROGRAMS += mcf5206/clock.rel
-mcf5206_clock_rel_SOURCES = mcf5206/clock/ckinit.c
-mcf5206_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mcf5206_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## mcf5206/mcfuart
-noinst_PROGRAMS += mcf5206/mcfuart.rel
-mcf5206_mcfuart_rel_SOURCES = mcf5206/console/mcfuart.c
-mcf5206_mcfuart_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mcf5206_mcfuart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## mcf5206/mbus
-noinst_PROGRAMS += mcf5206/mbus.rel
-mcf5206_mbus_rel_SOURCES = mcf5206/mbus/mcfmbus.c
-mcf5206_mbus_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mcf5206_mbus_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## mcf5206/timer
-noinst_PROGRAMS += mcf5206/timer.rel
-mcf5206_timer_rel_SOURCES = mcf5206/timer/timer.c mcf5206/timer/timerisr.S
-mcf5206_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-mcf5206_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 if mcf5272
 ## mcf5272/include
 ## clock