diff --git a/minix/kernel/Makefile b/minix/kernel/Makefile
index 41573f4cb..f2cdf4766 100644
--- a/minix/kernel/Makefile
+++ b/minix/kernel/Makefile
@@ -17,7 +17,7 @@ SRCS+=	clock.c cpulocals.c interrupt.c main.c proc.c system.c \
 
 LDADD+=	-ltimers -lsys -lexec 
 
-LINKERSCRIPT= ${.CURDIR}/arch/${MACHINE_ARCH}/kernel.lds
+LINKERSCRIPT= ${.CURDIR}/arch/${MACHINE_ARCH}/kernel-${BSP_NAME}.lds
 
 .if ${HAVE_GOLD:U} != ""
 CFLAGS+= -fno-common
diff --git a/minix/kernel/arch/earm/Makefile.inc b/minix/kernel/arch/earm/Makefile.inc
index ccb3a8dc2..2a1daa1b7 100644
--- a/minix/kernel/arch/earm/Makefile.inc
+++ b/minix/kernel/arch/earm/Makefile.inc
@@ -53,7 +53,7 @@ CPPFLAGS.subr_prf.c+= -Dputchar=kputc
 # Activate optional support, may be deactivated.
 CPPFLAGS.subr_prf.c+= -DLIBSA_PRINTF_LONGLONG_SUPPORT -DLIBSA_PRINTF_WIDTH_SUPPORT
 
-.include "bsp/ti/Makefile.inc"
+.include "bsp/${BSP_NAME}/Makefile.inc"
 
 # some object files we give a symbol prefix (or namespace) of __k_unpaged_
 # that must live in their own unique namespace.
diff --git a/minix/kernel/arch/earm/bsp/ti/Makefile.inc b/minix/kernel/arch/earm/bsp/omap/Makefile.inc
similarity index 80%
rename from minix/kernel/arch/earm/bsp/ti/Makefile.inc
rename to minix/kernel/arch/earm/bsp/omap/Makefile.inc
index a75a54e2c..142becd4b 100644
--- a/minix/kernel/arch/earm/bsp/ti/Makefile.inc
+++ b/minix/kernel/arch/earm/bsp/omap/Makefile.inc
@@ -2,7 +2,7 @@
 # BSP for TI hardware
 #
 
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/bsp/ti
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/bsp/${BSP_NAME}
 
 .for unpaged_obj in omap_serial.o omap_rtc.o omap_reset.o 
 BSP_OBJS_UNPAGED += ${unpaged_obj}
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_init.c b/minix/kernel/arch/earm/bsp/omap/omap_init.c
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_init.c
rename to minix/kernel/arch/earm/bsp/omap/omap_init.c
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_intr.c b/minix/kernel/arch/earm/bsp/omap/omap_intr.c
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_intr.c
rename to minix/kernel/arch/earm/bsp/omap/omap_intr.c
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_intr_registers.h b/minix/kernel/arch/earm/bsp/omap/omap_intr_registers.h
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_intr_registers.h
rename to minix/kernel/arch/earm/bsp/omap/omap_intr_registers.h
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_padconf.c b/minix/kernel/arch/earm/bsp/omap/omap_padconf.c
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_padconf.c
rename to minix/kernel/arch/earm/bsp/omap/omap_padconf.c
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_reset.c b/minix/kernel/arch/earm/bsp/omap/omap_reset.c
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_reset.c
rename to minix/kernel/arch/earm/bsp/omap/omap_reset.c
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_rtc.c b/minix/kernel/arch/earm/bsp/omap/omap_rtc.c
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_rtc.c
rename to minix/kernel/arch/earm/bsp/omap/omap_rtc.c
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_rtc.h b/minix/kernel/arch/earm/bsp/omap/omap_rtc.h
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_rtc.h
rename to minix/kernel/arch/earm/bsp/omap/omap_rtc.h
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_serial.c b/minix/kernel/arch/earm/bsp/omap/omap_serial.c
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_serial.c
rename to minix/kernel/arch/earm/bsp/omap/omap_serial.c
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_serial.h b/minix/kernel/arch/earm/bsp/omap/omap_serial.h
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_serial.h
rename to minix/kernel/arch/earm/bsp/omap/omap_serial.h
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_timer.c b/minix/kernel/arch/earm/bsp/omap/omap_timer.c
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_timer.c
rename to minix/kernel/arch/earm/bsp/omap/omap_timer.c
diff --git a/minix/kernel/arch/earm/bsp/ti/omap_timer_registers.h b/minix/kernel/arch/earm/bsp/omap/omap_timer_registers.h
similarity index 100%
rename from minix/kernel/arch/earm/bsp/ti/omap_timer_registers.h
rename to minix/kernel/arch/earm/bsp/omap/omap_timer_registers.h
diff --git a/minix/kernel/arch/earm/kernel.lds b/minix/kernel/arch/earm/kernel-omap.lds
similarity index 100%
rename from minix/kernel/arch/earm/kernel.lds
rename to minix/kernel/arch/earm/kernel-omap.lds
diff --git a/minix/kernel/arch/i386/kernel.lds b/minix/kernel/arch/i386/kernel-generic-pc.lds
similarity index 100%
rename from minix/kernel/arch/i386/kernel.lds
rename to minix/kernel/arch/i386/kernel-generic-pc.lds