diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 0c4e227ec3..233fe67342 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -10,24 +10,66 @@ CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 
-SUBDIRS = at91rm9200 mc9328mxl s3c2400
+SUBDIRS = mc9328mxl s3c2400
 
 noinst_PROGRAMS =
 
 
-# include
+## shared/include
 if shared
 include_libcpudir = $(includedir)/libcpu
 
 include_libcpu_HEADERS = shared/include/mmu.h
 
-## arm920
+## shared/arm920
 noinst_PROGRAMS += shared/arm920.rel
 shared_arm920_rel_SOURCES = shared/arm920/mmu.c
 shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
 shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
+if at91rm9200
+include_at91rm9200dir = $(includedir)/at91rm9200
+include_HEADERS =
+include_HEADERS += at91rm9200/include/at91rm9200.h at91rm9200/include/at91rm9200_dbgu.h \
+    at91rm9200/include/at91rm9200_emac.h at91rm9200/include/at91rm9200_gpio.h \
+    at91rm9200/include/at91rm9200_mem.h at91rm9200/include/at91rm9200_pmc.h at91rm9200/include/bits.h
+
+## at91rm9200/clock
+noinst_PROGRAMS += at91rm9200/clock.rel
+at91rm9200_clock_rel_SOURCES = at91rm9200/clock/clock.c
+at91rm9200_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
+at91rm9200_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## at91rm9200/dbgu
+noinst_PROGRAMS += at91rm9200/dbgu.rel
+at91rm9200_dbgu_rel_SOURCES = at91rm9200/dbgu/dbgu.c
+at91rm9200_dbgu_rel_CPPFLAGS = $(AM_CPPFLAGS)
+at91rm9200_dbgu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## at91rm9200/timer
+noinst_PROGRAMS += at91rm9200/timer.rel
+at91rm9200_timer_rel_SOURCES = at91rm9200/timer/timer.c
+at91rm9200_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
+at91rm9200_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## at91rm9200/pmc
+noinst_PROGRAMS += at91rm9200/pmc.rel
+at91rm9200_pmc_rel_SOURCES = at91rm9200/pmc/pmc.c
+at91rm9200_pmc_rel_CPPFLAGS = $(AM_CPPFLAGS)
+at91rm9200_pmc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## at91rm9200/interrupt
+include_HEADERS += at91rm9200/irq/irq.h
+
+noinst_PROGRAMS += at91rm9200/irq.rel
+at91rm9200_irq_rel_SOURCES = at91rm9200/irq/irq.c at91rm9200/irq/bsp_irq_init.c \
+    ../../libbsp/arm/shared/irq/irq_init.c at91rm9200/irq/bsp_irq_asm.S \
+    ../../libbsp/arm/shared/irq/irq_asm.S at91rm9200/irq/irq.h
+at91rm9200_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
+at91rm9200_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
 all-local: $(PREINSTALL_FILES)
 
 include $(srcdir)/preinstall.am