diff --git a/Makefile.base b/Makefile.base
index 8e781605f..fd8a00d70 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -1,8 +1,8 @@
-  ASMSRC = $(wildcard *.s)
-  ASMOBJ = $(ASMSRC:%.s=$(BINDIR)%.o)
-  SRC = $(wildcard *.c)
-  OBJ = $(SRC:%.c=$(BINDIR)%.o)
-  DEP = $(SRC:%.c=$(BINDIR)%.d)
+ASMSRC = $(wildcard *.s)
+ASMOBJ = $(ASMSRC:%.s=$(BINDIR)%.o)
+SRC = $(wildcard *.c)
+OBJ = $(SRC:%.c=$(BINDIR)%.o)
+DEP = $(SRC:%.c=$(BINDIR)%.d)
 
 ifeq ($(CPU),lpc2387)
  INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
@@ -25,6 +25,11 @@ ifeq ($(BOARD),msba2)
  INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
  INCLUDES += -I$(RIOTBOARD)/msba2-common/drivers/include/
 endif
+ifeq ($(BOARD),msb-430)
+ INCLUDES += -I$(RIOTBOARD)/msb-430/include/
+ INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
+ INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include/
+endif
 ifeq ($(BOARD),msb-430h)
  INCLUDES += -I$(RIOTBOARD)/msb-430h/include/
  INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
diff --git a/Makefile.modules b/Makefile.modules
index a2df71ea8..d3329c233 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -25,6 +25,6 @@ BL=$(USEMODULE:%= $(BINDIR)%.a)
 export BASELIBS = $(shell echo $(BL)|sed 's/[^ ]*hwtimer.a//')
 CFLAGS += $(EXTDEFINES)
 
-include $(RIOTBASE)/makefile.dep
+include $(RIOTBASE)/Makefile.dep
 
 export USEMODULE
diff --git a/core/Makefile b/core/Makefile
index ba54604b5..08d75b170 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2,4 +2,4 @@ MODULE =core
 
 INCLUDES = -Iinclude/ -I../sys/include -I../sys/lib -I../sys/drivers/include -I../cpu/$(CPU)/include/ -I../.. -I../drivers/include/
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/arm_common/Makefile b/cpu/arm_common/Makefile
index 0ac2b1fe1..46db97e24 100644
--- a/cpu/arm_common/Makefile
+++ b/cpu/arm_common/Makefile
@@ -1,7 +1,7 @@
 MODULE =arm_common
 INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../.. -I../../sys/lib/fat
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 
 
diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile
index 734a4056a..05b082a94 100644
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@@ -6,7 +6,7 @@ DIRS =
 all: $(BINDIR)$(MODULE).a
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 clean::
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
diff --git a/cpu/lpc2387/Makefile b/cpu/lpc2387/Makefile
index a85865698..963571e2a 100644
--- a/cpu/lpc2387/Makefile
+++ b/cpu/lpc2387/Makefile
@@ -15,7 +15,7 @@ endif
 all: $(BINDIR)$(MODULE).a
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 clean::
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
diff --git a/cpu/lpc2387/gpioint/Makefile b/cpu/lpc2387/gpioint/Makefile
index cf2b29f89..758cd9f32 100644
--- a/cpu/lpc2387/gpioint/Makefile
+++ b/cpu/lpc2387/gpioint/Makefile
@@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -
 
 MODULE =gpioint
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
diff --git a/cpu/lpc2387/mci/Makefile b/cpu/lpc2387/mci/Makefile
index cdffdd035..9034267a5 100644
--- a/cpu/lpc2387/mci/Makefile
+++ b/cpu/lpc2387/mci/Makefile
@@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -
 
 MODULE =mci
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
diff --git a/cpu/lpc2387/rtc/Makefile b/cpu/lpc2387/rtc/Makefile
index b3b66a79c..8cd5c1e0a 100644
--- a/cpu/lpc2387/rtc/Makefile
+++ b/cpu/lpc2387/rtc/Makefile
@@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
 
 MODULE =rtc
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
diff --git a/cpu/msp430-common/Makefile b/cpu/msp430-common/Makefile
index c08dbbb89..fd8276dbb 100644
--- a/cpu/msp430-common/Makefile
+++ b/cpu/msp430-common/Makefile
@@ -6,7 +6,7 @@ DIRS =
 all: $(BINDIR)$(MODULE).a
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 clean::
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
diff --git a/cpu/msp430x16x/Makefile b/cpu/msp430x16x/Makefile
index 07f55710d..bfc3c1924 100644
--- a/cpu/msp430x16x/Makefile
+++ b/cpu/msp430x16x/Makefile
@@ -6,7 +6,7 @@ DIRS =
 all: $(BINDIR)$(MODULE).a
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 clean::
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
diff --git a/dist/Makefile b/dist/Makefile
index 97a69a87c..0ff3694e5 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -3,120 +3,29 @@
 ####
 #### The Sample Filesystem Layout is:
 #### /this makefile
-#### ../RIOT 
-#### ../RIOT/board   for board definitions (if you have one or more)
-#### 
+#### ../../RIOT 
+#### ../../boards   for board definitions (if you have one or more)
+####/.. 
 
-#### Mandatory vars!
-
-# this has to be the absolute path of the RIOT-base dir
-export RIOTBASE =$(CURDIR)/../RIOT
-export RIOTBOARD =$(CURDIR)/../RIOT/board
-
-# the cpu to build for
-export CPU = lpc2387
-
-# toolchain config
-export PREFIX = @arm-elf-
-export CC = @$(PREFIX)gcc
-export AR = @$(PREFIX)ar
-export CFLAGS = -std=gnu99 -O2 -Wall -Wstrict-prototypes -mcpu=arm7tdmi-s -gdwarf-2
-export ASFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s
-export AS = $(PREFIX)as
-export LINK = $(PREFIX)gcc
-export SIZE = $(PREFIX)size
-export OBJCOPY = $(PREFIX)objcopy
-FLASH = lpc2k_pgm
-TERM = pyterm.py
-LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x
+# name of your project
+export PROJECT =foobar
 
-PROJBINDIR = bin
+# for easy switching of boards
+export BOARD = msb-430
 
-ifeq ($(strip $(PORT)),)
-	PORT = /dev/ttyUSB0
-endif
+# this has to be the absolute path of the RIOT-base dir
+export RIOTBASE =$(CURDIR)/../../RIOT
+export RIOTBOARD =$(CURDIR)/../../boards
 
 ## Modules to include. 
 
-#USEMODULE += nanopan5375_proprietary
-#USEMODULE += sys
-#USEMODULE += cmdd
-#USEMODULE += logd
-#USEMODULE += mprint
-#USEMODULE += mqueue
-#USEMODULE += sync_read
-#USEMODULE += sysmon
-#USEMODULE += syslog
-#USEMODULE += tracelog
 #USEMODULE += shell
-#USEMODULE += utimer
+#USEMODULE += vtimer
 #USEMODULE += sht11
-#USEMODULE += powermon
 #USEMODULE += ltc4150
-#USEMODULE += sys_config
 #USEMODULE += cc110x
-#USEMODULE += cmdengine
-#USEMODULE += ezxml
 #USEMODULE += fat
-#USEMODULE += gps
-#USEMODULE += geo
-#USEMODULE += gps_conversion
-#USEMODULE += gps_ublox
-#USEMODULE += net_kernel
-#USEMODULE += net_mm
-
-#### Project Config 
-
-# name of your project
-PROJECT = hello-world
-
-# for easy switching of boards
-export BOARD = msba2
-
-# mandatory include! 
-include $(RIOTBASE)/makefile.modules 
-
-# if you want to publish the board into the sources as an uppercase #define
-BB = $(shell echo $(BOARD)|tr 'a-z' 'A-Z')
-CFLAGS += -DBOARD_$(BB)
-export CFLAGS
-
-# your binaries to link
-BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a
-BASELIBS += $(PROJBINDIR)/project.a
-
-INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/cpu/$(CPU)/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/
-
-export INCLUDES
-
-## make script for your project. Build RIOT-base here!
-all: $(PROJBINDIR)/$(PROJECT).a
-	@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(CPU)."
-	$(MAKE) -C $(RIOTBOARD)
-	$(MAKE) -C $(RIOTBASE)
-	$(LINK) $(LINKFLAGS) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group  -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map
-	$(SIZE) $(PROJBINDIR)/$(PROJECT).elf
-	$(OBJCOPY) -O ihex $(PROJBINDIR)/$(PROJECT).elf $(PROJBINDIR)/$(PROJECT).hex
-
-## your make rules
-## Only basic example - modify it for larger projects!!
-
-$(PROJBINDIR)/$(PROJECT).a: $(PROJBINDIR)/$(PROJECT).o
-	$(AR) -rc $(PROJBINDIR)/project.a $(PROJBINDIR)/$(PROJECT).o 
-	
-$(PROJBINDIR)/$(PROJECT).o: main.c 
-	$(CC) $(CFLAGS) $(BOARDINCLUDE) $(INCLUDES) -c main.c -o $(PROJBINDIR)/$(PROJECT).o
-
-clean:
-	$(MAKE) -C $(RIOTBOARD) clean
-	$(MAKE) -C $(RIOTBASE) clean
-	rm -f $(PROJBINDIR)/*
-
-flash: all
-	$(FLASH) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
 
-term:
-	$(TERM) $(PORT)
+export INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/cpu/$(CPU)/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/
 
-doc:
-	make -BC $(RIOTBASE) doc
+include $(RIOTBASE)/Makefile.include
diff --git a/dist/tools/testsuite/generate_html.sh b/dist/tools/testsuite/generate_html.sh
index 2d4b475f7..8944bf8f5 100755
--- a/dist/tools/testsuite/generate_html.sh
+++ b/dist/tools/testsuite/generate_html.sh
@@ -6,7 +6,7 @@ HTMLDIR=${TOOLROOT}/tools/testsuite/html
 
 test -f ~/.buildbot && . ~/.buildbot
 
-OUTFILE=${HTMLFILE:-${HOME}/firekernel.html}
+OUTFILE=${HTMLFILE:-${HOME}/riot.html}
 LOGDIR=${BUILDLOGS:-${HOME}/buildlogs}
 
 {
diff --git a/drivers/Makefile b/drivers/Makefile
index 763f2544b..273d1e002 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -24,7 +24,7 @@ endif
 all:
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 # remove compilation products
 clean::
diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile
index b3519713c..b90bdac55 100644
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@@ -2,6 +2,6 @@ INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../.
 
 MODULE =cc110x_ng
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/drivers/cc110x_ng/Makefile b/drivers/cc110x_ng/Makefile
index 1a28fd087..6fadf78ad 100644
--- a/drivers/cc110x_ng/Makefile
+++ b/drivers/cc110x_ng/Makefile
@@ -12,7 +12,7 @@ endif
 all: $(BINDIR)$(MODULE).a
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 clean::
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
diff --git a/drivers/cc110x_ng/spi/Makefile b/drivers/cc110x_ng/spi/Makefile
index 1d02bec10..644fb0062 100644
--- a/drivers/cc110x_ng/spi/Makefile
+++ b/drivers/cc110x_ng/spi/Makefile
@@ -2,5 +2,5 @@ INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../.
 
 MODULE =cc110x_spi
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
diff --git a/drivers/ltc4150/Makefile b/drivers/ltc4150/Makefile
index b1ca86306..1365fbf92 100644
--- a/drivers/ltc4150/Makefile
+++ b/drivers/ltc4150/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I$(RIOTBASE)/core/include -I../include/
 MODULE =ltc4150
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/drivers/sht11/Makefile b/drivers/sht11/Makefile
index cd43db5ef..51acccc98 100644
--- a/drivers/sht11/Makefile
+++ b/drivers/sht11/Makefile
@@ -1,5 +1,5 @@
 INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
 MODULE =sht11
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/sys/Makefile b/sys/Makefile
index 0e05f6712..6af74be05 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -72,7 +72,7 @@ endif
 all: $(BINDIR)$(MODULE).a 
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
 # remove compilation products
 clean::
diff --git a/sys/auto_init/Makefile b/sys/auto_init/Makefile
index ffa6c4d6c..cf0cb48c7 100644
--- a/sys/auto_init/Makefile
+++ b/sys/auto_init/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =auto_init
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/config/Makefile b/sys/config/Makefile
index ea4db12a3..a33297899 100644
--- a/sys/config/Makefile
+++ b/sys/config/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I$(RIOTBASE)/core/include
 MODULE =config
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/lib/Makefile b/sys/lib/Makefile
index 39621155e..18996f3c3 100644
--- a/sys/lib/Makefile
+++ b/sys/lib/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../lib/cmdengine -I../net -I../../hal/include -I../../core/include -I../config
 MODULE =lib
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/logd/Makefile b/sys/logd/Makefile
index 92bc22a69..af6415cf2 100644
--- a/sys/logd/Makefile
+++ b/sys/logd/Makefile
@@ -2,6 +2,6 @@ INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include
 
 MODULE =logd
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/sys/net/mm/Makefile b/sys/net/mm/Makefile
index 616321f4c..e8e3b6607 100644
--- a/sys/net/mm/Makefile
+++ b/sys/net/mm/Makefile
@@ -2,5 +2,5 @@ INCLUDES = -I.. -I../../include -I../../drivers/include -I../../../core/include
 
 MODULE =net_mm
 
-include $(MAKEBASE)/makefile.base	
+include $(MAKEBASE)/Makefile.base	
 
diff --git a/sys/ping/Makefile b/sys/ping/Makefile
index 14489d8a7..e944af2dc 100644
--- a/sys/ping/Makefile
+++ b/sys/ping/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =ping
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/posix/Makefile b/sys/posix/Makefile
index 4ce0d5187..095298af2 100644
--- a/sys/posix/Makefile
+++ b/sys/posix/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I$(RIOTBASE)/core/include
 MODULE =posix
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/ps/Makefile b/sys/ps/Makefile
index 6c374d75a..11d068098 100644
--- a/sys/ps/Makefile
+++ b/sys/ps/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =ps
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile
index 1008c51a7..c14ee9bce 100644
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@@ -1,8 +1,6 @@
-#SRC = cc1100.c cc110x_ng.c disk.c id.c ltc4150.c ps.c rtc.c shell.c shell_commands.c sht11.c
 SRC = shell_commands.c sc_id.c
 INCLUDES = -I../../../core/include -I../../include -I../../../drivers/include/
 
-#cc1100.c  cc110x_ng.c  disk.c  id.c  Jamfile  ltc4150.c  makefile  makefile.commands  ps.c  rtc.c  shell.c  shell_commands.c  sht11.c
 ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
 	SRC += sc_cc110x_ng.c
diff --git a/sys/swtimer/Makefile b/sys/swtimer/Makefile
index 2d5bd71b8..b586e5476 100644
--- a/sys/swtimer/Makefile
+++ b/sys/swtimer/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =swtimer
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/syslog/Makefile b/sys/syslog/Makefile
index 968486c1c..6d9a30e8f 100644
--- a/sys/syslog/Makefile
+++ b/sys/syslog/Makefile
@@ -1,6 +1,6 @@
 INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../lib/cmdengine -I../net -I../../hal/include -I../../core/include -I../config
 MODULE =syslog
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/sys/timex/Makefile b/sys/timex/Makefile
index 1ef2448bf..09c9f9c7c 100644
--- a/sys/timex/Makefile
+++ b/sys/timex/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include 
 MODULE =timex
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/tracelog/Makefile b/sys/tracelog/Makefile
index 899971b57..350c65eb1 100644
--- a/sys/tracelog/Makefile
+++ b/sys/tracelog/Makefile
@@ -1,6 +1,6 @@
 INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../lib/cmdengine -I../net -I../../hal/include -I../../core/include -I../config
 MODULE =tracelog
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile
index 8216bd217..cc75d9d7d 100644
--- a/sys/transceiver/Makefile
+++ b/sys/transceiver/Makefile
@@ -1,6 +1,6 @@
 INCLUDES = -I../include -I$(RIOTBAE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I../lib -I../../cpu/$(CPU)/include -I../../cpu/ -I../net -I../../hal/include -I../../core/include -I../config
 MODULE =transceiver
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/sys/uart0/Makefile b/sys/uart0/Makefile
index 72c2cbda2..2f2d2f238 100644
--- a/sys/uart0/Makefile
+++ b/sys/uart0/Makefile
@@ -2,6 +2,6 @@ INCLUDES = -I../include -I../drivers/include -I../lib -I../../cpu/$(CPU)/include
 
 MODULE =uart0
 
-include $(MAKEBASE)/makefile.base
+include $(MAKEBASE)/Makefile.base
 
 
diff --git a/sys/vtimer/Makefile b/sys/vtimer/Makefile
index 6c1df6e8e..adb12a5d8 100644
--- a/sys/vtimer/Makefile
+++ b/sys/vtimer/Makefile
@@ -1,5 +1,5 @@
 INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =vtimer
 
-include $(RIOTBASE)/makefile.base
+include $(RIOTBASE)/Makefile.base