diff --git a/Makefile.include b/Makefile.include
index f9c83051455e..5b08f8463284 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -97,6 +97,8 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
 include $(RIOTCPU)/$(CPU)/Makefile.include
 include $(RIOTBASE)/Makefile.dep
 
+USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
+
 ifeq ($(strip $(MCU)),)
 	MCU = $(CPU)
 endif
diff --git a/Makefile.modules b/Makefile.modules
index 9411480d584e..5f2118064512 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -1,7 +1,7 @@
 include $(RIOTBASE)/Makefile.pseudomodules
 include $(RIOTBASE)/Makefile.defaultmodules
 
-USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
+USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE)))
 
 INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
 ED = $(patsubst %,-DMODULE_%,$(subst -,_,$(USEMODULE) $(USEPKG)))
diff --git a/boards/chronos/Makefile.features b/boards/chronos/Makefile.features
index 5f9d34a50ebc..a62395a35018 100644
--- a/boards/chronos/Makefile.features
+++ b/boards/chronos/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED = transceiver periph_rtc
+FEATURES_PROVIDED += transceiver periph_rtc
diff --git a/boards/msb-430h/Makefile.features b/boards/msb-430h/Makefile.features
index af23a974c897..3f4b26f74272 100644
--- a/boards/msb-430h/Makefile.features
+++ b/boards/msb-430h/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver
+FEATURES_PROVIDED += transceiver config
diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features
index 66243c08124c..f853e7d3de50 100644
--- a/boards/msba2/Makefile.features
+++ b/boards/msba2/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver periph_pwm periph_rtc cpp
+FEATURES_PROVIDED += transceiver periph_pwm periph_rtc cpp config
diff --git a/boards/native/Makefile.features b/boards/native/Makefile.features
index 251d81bea68c..4ad14738b855 100644
--- a/boards/native/Makefile.features
+++ b/boards/native/Makefile.features
@@ -1,3 +1,3 @@
-FEATURES_PROVIDED += transceiver periph_cpuid cpp
+FEATURES_PROVIDED += transceiver periph_cpuid config cpp
 FEATURES_PROVIDED += periph_random
 FEATURES_PROVIDED += periph_rtc
diff --git a/boards/wsn430-v1_3b/Makefile.features b/boards/wsn430-v1_3b/Makefile.features
index af23a974c897..3f4b26f74272 100644
--- a/boards/wsn430-v1_3b/Makefile.features
+++ b/boards/wsn430-v1_3b/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver
+FEATURES_PROVIDED += transceiver config
diff --git a/boards/wsn430-v1_4/Makefile.features b/boards/wsn430-v1_4/Makefile.features
index af23a974c897..3f4b26f74272 100644
--- a/boards/wsn430-v1_4/Makefile.features
+++ b/boards/wsn430-v1_4/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED += transceiver
+FEATURES_PROVIDED += transceiver config
diff --git a/drivers/at86rf231/at86rf231.c b/drivers/at86rf231/at86rf231.c
index 8bd58903fb9e..a5d515197b6f 100644
--- a/drivers/at86rf231/at86rf231.c
+++ b/drivers/at86rf231/at86rf231.c
@@ -27,6 +27,7 @@
 #include "kernel_types.h"
 #include "transceiver.h"
 #include "hwtimer.h"
+#include "config.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"
diff --git a/examples/default/Makefile b/examples/default/Makefile
index 6c96ecea35a5..dfaee975c8ca 100644
--- a/examples/default/Makefile
+++ b/examples/default/Makefile
@@ -35,8 +35,10 @@ USEMODULE += shell_commands
 USEMODULE += ps
 USEMODULE += vtimer
 USEMODULE += defaulttransceiver
+USEMODULE += config
 
 FEATURES_OPTIONAL += transceiver
+FEATURES_OPTIONAL += config
 FEATURES_OPTIONAL += periph_rtc
 
 ifneq (,$(filter msb-430,$(BOARD)))
@@ -46,12 +48,10 @@ ifneq (,$(filter msba2,$(BOARD)))
 	USEMODULE += sht11
 	USEMODULE += ltc4150
 	USEMODULE += mci
-	USEMODULE += config
 	USEMODULE += random
 endif
 ifneq (,$(filter native,$(BOARD)))
 	USEMODULE += ltc4150
-	USEMODULE += config
 	USEMODULE += random
 endif
 ifneq (,$(filter iot-lab_M3,$(BOARD)))