diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep
index 90564bbaee..a4578de2ab 100644
--- a/boards/msb-430h/Makefile.dep
+++ b/boards/msb-430h/Makefile.dep
@@ -1,5 +1,5 @@
-ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
-	ifeq (,$(findstring cc110x_spi,$(USEMODULE)))
+ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+	ifeq (,$(filter cc110x_spi,$(USEMODULE)))
 		USEMODULE += cc110x_spi
 	endif
 endif
diff --git a/boards/msba2-common/Makefile.dep b/boards/msba2-common/Makefile.dep
index e062677cf7..01d2b08098 100644
--- a/boards/msba2-common/Makefile.dep
+++ b/boards/msba2-common/Makefile.dep
@@ -1,20 +1,20 @@
-ifneq (,$(findstring cc110x,$(USEMODULE)))
-	ifeq (,$(findstring gpioint,$(USEMODULE)))
+ifneq (,$(filter cc110x,$(USEMODULE)))
+	ifeq (,$(filter gpioint,$(USEMODULE)))
 		USEMODULE += gpioint
 	endif
 endif
 
-ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
-	ifeq (,$(findstring cc110x_spi,$(USEMODULE)))
+ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+	ifeq (,$(filter cc110x_spi,$(USEMODULE)))
 		USEMODULE += cc110x_spi
 	endif
-	ifeq (,$(findstring gpioint,$(USEMODULE)))
+	ifeq (,$(filter gpioint,$(USEMODULE)))
 		USEMODULE += gpioint
 	endif
 endif
 
-ifneq (,$(findstring ltc4150,$(USEMODULE)))
-	ifeq (,$(findstring gpioint,$(USEMODULE)))
+ifneq (,$(filter ltc4150,$(USEMODULE)))
+	ifeq (,$(filter gpioint,$(USEMODULE)))
 		USEMODULE += gpioint
 	endif
 endif
diff --git a/boards/native/Makefile.dep b/boards/native/Makefile.dep
index d79ab4cc74..483dfa9940 100644
--- a/boards/native/Makefile.dep
+++ b/boards/native/Makefile.dep
@@ -1,5 +1,5 @@
-ifneq (,$(findstring ltc4150,$(USEMODULE)))
-	ifeq (,$(findstring hwtimer,$(USEMODULE)))
+ifneq (,$(filter ltc4150,$(USEMODULE)))
+	ifeq (,$(filter hwtimer,$(USEMODULE)))
 		USEMODULE += hwtimer
 	endif
 endif
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
index f8ddcdfa8e..bdcc4039c9 100644
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@@ -43,7 +43,7 @@ endif
 endif
 
 # set the tap interface for term/valgrind
-ifneq (,$(findstring nativenet,$(USEMODULE)))
+ifneq (,$(filter nativenet,$(USEMODULE)))
 	export PORT ?= tap0
 else
 	export PORT =
diff --git a/boards/wsn430-v1_3b/Makefile.dep b/boards/wsn430-v1_3b/Makefile.dep
index 4a8dfc510e..ef9279fd5e 100644
--- a/boards/wsn430-v1_3b/Makefile.dep
+++ b/boards/wsn430-v1_3b/Makefile.dep
@@ -1,5 +1,5 @@
-ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
-    ifeq (,$(findstring cc110x_spi,$(USEMODULE)))
+ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+    ifeq (,$(filter cc110x_spi,$(USEMODULE)))
         USEMODULE += cc110x_spi
     endif
 endif
diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include
index 88b3700a3f..316b867f1b 100644
--- a/boards/wsn430-v1_4/Makefile.include
+++ b/boards/wsn430-v1_4/Makefile.include
@@ -1,10 +1,10 @@
 export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include
 
-ifeq (,$(findstring cc2420,$(USEMODULE)))
+ifeq (,$(filter cc2420,$(USEMODULE)))
 	USEMODULE += cc2420
 endif
 
-ifneq (,$(findstring cc2420,$(USEMODULE)))
+ifneq (,$(filter cc2420,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \
 				-I$(RIOTBASE)/sys/net/include
 endif
diff --git a/cpu/lpc2387/Makefile b/cpu/lpc2387/Makefile
index fbee8f02d5..aea6240925 100644
--- a/cpu/lpc2387/Makefile
+++ b/cpu/lpc2387/Makefile
@@ -3,16 +3,16 @@ MODULE =cpu
 include $(RIOTCPU)/$(CPU)/Makefile.include
 
 DIRS = $(RIOTCPU)/arm_common $(RIOTCPU)/lpc_common
-ifneq (,$(findstring gpioint,$(USEMODULE)))
+ifneq (,$(filter gpioint,$(USEMODULE)))
 	DIRS += gpioint
 endif
-ifneq (,$(findstring mci,$(USEMODULE)))
+ifneq (,$(filter mci,$(USEMODULE)))
 	DIRS += mci
 endif
-ifneq (,$(findstring rtc,$(USEMODULE)))
+ifneq (,$(filter rtc,$(USEMODULE)))
 	DIRS += rtc
 endif
-ifneq (,$(findstring i2c,$(USEMODULE)))
+ifneq (,$(filter i2c,$(USEMODULE)))
 	DIRS += i2c
 endif
 
diff --git a/cpu/mc1322x/Makefile b/cpu/mc1322x/Makefile
index 9bb19b004b..2b1f4cbbd4 100644
--- a/cpu/mc1322x/Makefile
+++ b/cpu/mc1322x/Makefile
@@ -1,10 +1,10 @@
 MODULE =cpu
 
 DIRS = $(RIOTCPU)/arm_common
-ifneq (,$(findstring mc1322x_adc,$(USEMODULE)))
-  DIRS += adc
+ifneq (,$(filter mc1322x_adc,$(USEMODULE)))
+	DIRS += adc
 endif
-ifneq (,$(findstring mc1322x_asm,$(USEMODULE)))
+ifneq (,$(filter mc1322x_asm,$(USEMODULE)))
 	DIRS += asm
 endif
 
diff --git a/cpu/native/Makefile b/cpu/native/Makefile
index 0f224273c6..6ff5992f33 100644
--- a/cpu/native/Makefile
+++ b/cpu/native/Makefile
@@ -3,10 +3,10 @@ MODULE = cpu
 EXCLUDES := -I$(RIOTBASE)/sys/posix/%
 
 DIRS =
-ifneq (,$(findstring rtc,$(USEMODULE)))
+ifneq (,$(filter rtc,$(USEMODULE)))
 	DIRS += rtc
 endif
-ifneq (,$(findstring nativenet,$(USEMODULE)))
+ifneq (,$(filter nativenet,$(USEMODULE)))
 	DIRS += net
 endif
 
diff --git a/drivers/Makefile b/drivers/Makefile
index f66acf8219..15514ab56f 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,38 +1,38 @@
 MODULE = drivers
 
 DIRS=
-ifneq (,$(findstring powermon,$(USEMODULE)))
+ifneq (,$(filter powermon,$(USEMODULE)))
     DIRS += powermon
 endif
-ifneq (,$(findstring cc2420,$(USEMODULE)))
+ifneq (,$(filter cc2420,$(USEMODULE)))
     DIRS += cc2420
 endif
-ifneq (,$(findstring sht11,$(USEMODULE)))
+ifneq (,$(filter sht11,$(USEMODULE)))
     DIRS += sht11
 endif
-ifneq (,$(findstring ltc4150,$(USEMODULE)))
+ifneq (,$(filter ltc4150,$(USEMODULE)))
     DIRS += ltc4150
 endif
-ifneq (,$(findstring cc110x,$(USEMODULE)))
-    ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
+ifneq (,$(filter cc110x,$(USEMODULE)))
+    ifneq (,$(filter cc110x_ng,$(USEMODULE)))
     	DIRS += cc110x_ng
     else
     	DIRS += cc110x
     endif
 endif
-ifneq (,$(findstring at86rf231,$(USEMODULE)))
+ifneq (,$(filter at86rf231,$(USEMODULE)))
     DIRS += at86rf231
 endif
-ifneq (,$(findstring gps_ublox,$(USEMODULE)))
+ifneq (,$(filter gps_ublox,$(USEMODULE)))
     DIRS += gps_ublox
 endif
-ifneq (,$(findstring srf02,$(USEMODULE)))
+ifneq (,$(filter srf02,$(USEMODULE)))
     DIRS += srf02
 endif
-ifneq (,$(findstring srf08,$(USEMODULE)))
+ifneq (,$(filter srf08,$(USEMODULE)))
     DIRS += srf08
 endif
-ifneq (,$(findstring lm75a,$(USEMODULE)))
+ifneq (,$(filter lm75a,$(USEMODULE)))
     DIRS += lm75a
 endif
 
diff --git a/drivers/cc110x_ng/Makefile b/drivers/cc110x_ng/Makefile
index 7cd2e223ba..92b346a860 100644
--- a/drivers/cc110x_ng/Makefile
+++ b/drivers/cc110x_ng/Makefile
@@ -1,13 +1,13 @@
 MODULE =cc110x_ng
 
 DIRS =
-ifneq (,$(findstring msb-430h,$(BOARD)))
+ifneq (,$(filter msb-430h,$(BOARD)))
 	DIRS += spi
 endif
-ifneq (,$(findstring msba2,$(BOARD)))
+ifneq (,$(filter msba2,$(BOARD)))
 	DIRS += spi
 endif
-ifneq (,$(findstring wsn430-v1_3b,$(BOARD)))
+ifneq (,$(filter wsn430-v1_3b,$(BOARD)))
 	DIRS += spi
 endif
 
diff --git a/examples/default/Makefile b/examples/default/Makefile
index 1ac0c27c08..556a51b882 100644
--- a/examples/default/Makefile
+++ b/examples/default/Makefile
@@ -35,19 +35,22 @@ USEMODULE += shell_commands
 USEMODULE += ps
 USEMODULE += vtimer
 USEMODULE += auto_init
-ifneq (,$(findstring msb-430,$(BOARD)))
+ifneq (,$(filter msb-430,$(BOARD)))
 	USEMODULE += sht11
 endif
-ifneq (,$(findstring chronos,$(BOARD)))
+ifneq (,$(filter msb-430h,$(BOARD)))
+	USEMODULE += sht11
+endif
+ifneq (,$(filter chronos,$(BOARD)))
 	USEMODULE += cc110x_ng
 endif
-ifneq (,$(findstring wsn430-v1_3b,$(BOARD)))
+ifneq (,$(filter wsn430-v1_3b,$(BOARD)))
 	USEMODULE += cc110x_ng
 endif
-ifneq (,$(findstring msb-430h,$(BOARD)))
+ifneq (,$(filter msb-430h,$(BOARD)))
 	USEMODULE += cc110x_ng
 endif
-ifneq (,$(findstring msba2,$(BOARD)))
+ifneq (,$(filter msba2,$(BOARD)))
 	USEMODULE += sht11
 	USEMODULE += ltc4150
 	USEMODULE += rtc
@@ -56,7 +59,7 @@ ifneq (,$(findstring msba2,$(BOARD)))
 	USEMODULE += config
 	USEMODULE += random
 endif
-ifneq (,$(findstring native,$(BOARD)))
+ifneq (,$(filter native,$(BOARD)))
 	USEMODULE += ltc4150
 	USEMODULE += rtc
 	USEMODULE += nativenet
diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile
index 13beb78fef..4509c6c907 100644
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@@ -1,32 +1,32 @@
 SRC = shell_commands.c sc_id.c
 
-ifneq (,$(findstring transceiver,$(USEMODULE)))
+ifneq (,$(filter transceiver,$(USEMODULE)))
 	SRC += sc_transceiver.c
 endif
-ifneq (,$(findstring cc110x,$(USEMODULE)))
-	ifeq (,$(findstring transceiver,$(USEMODULE)))
+ifneq (,$(filter cc110x,$(USEMODULE)))
+	ifeq (,$(filter transceiver,$(USEMODULE)))
 		SRC += sc_cc1100.c
 	endif
 endif
-ifneq (,$(findstring mci,$(USEMODULE)))
+ifneq (,$(filter mci,$(USEMODULE)))
 	SRC += sc_disk.c
 endif
-ifneq (,$(findstring ltc4150,$(USEMODULE)))
+ifneq (,$(filter ltc4150,$(USEMODULE)))
 	SRC += sc_ltc4150.c
 endif
-ifneq (,$(findstring ps,$(USEMODULE)))
+ifneq (,$(filter ps,$(USEMODULE)))
 	SRC += sc_ps.c
 endif
-ifneq (,$(findstring rtc,$(USEMODULE)))
+ifneq (,$(filter rtc,$(USEMODULE)))
 	SRC += sc_rtc.c
 endif
-ifneq (,$(findstring sht11,$(USEMODULE)))
+ifneq (,$(filter sht11,$(USEMODULE)))
 	SRC += sc_sht11.c
 endif
-ifneq (,$(findstring lpc_common,$(USEMODULE)))
+ifneq (,$(filter lpc_common,$(USEMODULE)))
 	SRC += sc_heap.c
 endif
-ifneq (,$(findstring random,$(USEMODULE)))
+ifneq (,$(filter random,$(USEMODULE)))
 	SRC += sc_mersenne.c
 endif
 
diff --git a/tests/test_bloom/Makefile b/tests/test_bloom/Makefile
index 1d5d7ddefa..893f546862 100644
--- a/tests/test_bloom/Makefile
+++ b/tests/test_bloom/Makefile
@@ -7,8 +7,11 @@ export BOARD ?= native
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE = $(CURDIR)/../..
 
-ifneq (,$(findstring msb-430,$(BOARD)))
-include $(RIOTBASE)/Makefile.unsupported
+ifneq (,$(filter msb-430,$(BOARD)))
+	include $(RIOTBASE)/Makefile.unsupported
+else
+ifneq (,$(filter msb-430h,$(BOARD)))
+	include $(RIOTBASE)/Makefile.unsupported
 else
 
 ## Modules to include.
diff --git a/tests/test_bloom_bytes/Makefile b/tests/test_bloom_bytes/Makefile
index 95380e5f53..74998e3a81 100644
--- a/tests/test_bloom_bytes/Makefile
+++ b/tests/test_bloom_bytes/Makefile
@@ -7,7 +7,7 @@ export BOARD ?= native
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE = $(CURDIR)/../..
 
-ifneq (,$(findstring msb-430,$(BOARD)))
+ifneq (,$(filter msb-430,$(BOARD)))
 include $(RIOTBASE)/Makefile.unsupported
 else
 
diff --git a/tests/test_irq/Makefile b/tests/test_irq/Makefile
index 3a7ababb9b..ee4a689115 100644
--- a/tests/test_irq/Makefile
+++ b/tests/test_irq/Makefile
@@ -7,7 +7,7 @@ export BOARD ?= native
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE = $(CURDIR)/../..
 
-ifeq (,$(findstring native,$(BOARD)))
+ifeq (,$(filter native,$(BOARD)))
 	include $(RIOTBASE)/Makefile.unsupported
 else
 
diff --git a/tests/test_nativenet/Makefile b/tests/test_nativenet/Makefile
index 161280568b..788af87e4d 100644
--- a/tests/test_nativenet/Makefile
+++ b/tests/test_nativenet/Makefile
@@ -10,7 +10,7 @@ export BOARD = native
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE = $(CURDIR)/../..
 
-ifeq (,$(findstring native,$(BOARD)))
+ifeq (,$(filter native,$(BOARD)))
 include $(RIOTBASE)/Makefile.unsupported
 else