diff --git a/arch/cpu/msp430/f1xxx/spi.c b/arch/cpu/msp430/f1xxx/spi-legacy.c
similarity index 100%
rename from arch/cpu/msp430/f1xxx/spi.c
rename to arch/cpu/msp430/f1xxx/spi-legacy.c
diff --git a/arch/cpu/msp430/f2xxx/spi.c b/arch/cpu/msp430/f2xxx/spi-legacy.c
similarity index 100%
rename from arch/cpu/msp430/f2xxx/spi.c
rename to arch/cpu/msp430/f2xxx/spi-legacy.c
diff --git a/arch/cpu/msp430/f5xxx/spi.c b/arch/cpu/msp430/f5xxx/spi-legacy.c
similarity index 100%
rename from arch/cpu/msp430/f5xxx/spi.c
rename to arch/cpu/msp430/f5xxx/spi-legacy.c
diff --git a/arch/platform/sky/Makefile.common b/arch/platform/sky/Makefile.common
index 1dea28846..081ffaa9f 100644
--- a/arch/platform/sky/Makefile.common
+++ b/arch/platform/sky/Makefile.common
@@ -1,6 +1,6 @@
 # $Id: Makefile.common,v 1.3 2010/08/24 16:24:11 joxe Exp $
 
-ARCH=spi.c ds2411.c xmem.c i2c.c node-id.c sensors.c cfs-coffee.c \
+ARCH=spi-legacy.c ds2411.c xmem.c i2c.c node-id.c sensors.c cfs-coffee.c \
      cc2420.c cc2420-arch.c cc2420-arch-sfd.c \
      sky-sensors.c uip-ipchksum.c \
      uart1.c slip_uart1.c uart1-putchar.c platform.c