diff --git a/Makefile.dep b/Makefile.dep
index e79b1b33c7dddc8d0d45c9c796345becf8d50a0d..c1e1ba57877a206183d541cc7960c100730b06a6 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -25,7 +25,7 @@ ifneq (,$(filter uart0,$(USEMODULE)))
 	endif
 endif
 
-ifneq (,$(filter cc110x,$(USEMODULE)))
+ifneq (,$(filter cc110x%,$(USEMODULE)))
 	ifeq (,$(filter protocol_multiplex,$(USEMODULE)))
 		USEMODULE += protocol_multiplex
 	endif
diff --git a/drivers/Makefile b/drivers/Makefile
index 15514ab56f3df0bca00c8e143e9b61b6a18cc977..e5fe1f7e9ffe803e0798fa725a1755293fd88892 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -14,11 +14,10 @@ ifneq (,$(filter ltc4150,$(USEMODULE)))
     DIRS += ltc4150
 endif
 ifneq (,$(filter cc110x,$(USEMODULE)))
-    ifneq (,$(filter cc110x_ng,$(USEMODULE)))
-    	DIRS += cc110x_ng
-    else
-    	DIRS += cc110x
-    endif
+    DIRS += cc110x
+endif
+ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+    DIRS += cc110x_ng
 endif
 ifneq (,$(filter at86rf231,$(USEMODULE)))
     DIRS += at86rf231