diff --git a/wireless/bluetooth/.gitignore b/wireless/bluetooth/.gitignore
new file mode 100644
index 000000000..99f41601f
--- /dev/null
+++ b/wireless/bluetooth/.gitignore
@@ -0,0 +1,2 @@
+/Kconfig
+
diff --git a/wireless/bluetooth/Kconfig b/wireless/bluetooth/Kconfig
deleted file mode 100644
index ca77392fe..000000000
--- a/wireless/bluetooth/Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see misc/tools/kconfig-language.txt.
-#
-
-menu "Bluetooth applications"
-
-source "$APPSDIR/wireless/bluetooth/btsak/Kconfig"
-
-endmenu # Bluetooth applications
diff --git a/wireless/bluetooth/Makefile b/wireless/bluetooth/Makefile
index ad5b85ead..15d794bb6 100644
--- a/wireless/bluetooth/Makefile
+++ b/wireless/bluetooth/Makefile
@@ -33,38 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config # Current configuration
+MENUDESC = "Bluetooth applications"
 
-# Sub-directories
-
-SUBDIRS = $(dir $(wildcard */Makefile))
-
-all: nothing
-
-.PHONY: nothing context depend clean distclean preconfig
-
-define SDIR_template
-$(1)_$(2):
-	$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-endef
-
-$(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
-
-nothing:
-
-install:
-
-context: $(foreach SDIR, $(CNTXTDIRS), $(SDIR)_context)
-
-depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
-
-clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
-
-distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
-
- preconfig:
-
--include Make.dep
+include $(APPDIR)/Directory.mk
diff --git a/wireless/ieee802154/.gitignore b/wireless/ieee802154/.gitignore
new file mode 100644
index 000000000..99f41601f
--- /dev/null
+++ b/wireless/ieee802154/.gitignore
@@ -0,0 +1,2 @@
+/Kconfig
+
diff --git a/wireless/ieee802154/Kconfig b/wireless/ieee802154/Kconfig
deleted file mode 100644
index 7cb6c896d..000000000
--- a/wireless/ieee802154/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see misc/tools/kconfig-language.txt.
-#
-
-menu "IEEE 802.15.4 applications"
-
-source "$APPSDIR/wireless/ieee802154/libmac/Kconfig"
-source "$APPSDIR/wireless/ieee802154/libutils/Kconfig"
-source "$APPSDIR/wireless/ieee802154/i8sak/Kconfig"
-source "$APPSDIR/wireless/ieee802154/i8shark/Kconfig"
-
-endmenu #ieee 802.15.4 apps
diff --git a/wireless/ieee802154/Makefile b/wireless/ieee802154/Makefile
index 3e31d5ac1..d99cf8779 100644
--- a/wireless/ieee802154/Makefile
+++ b/wireless/ieee802154/Makefile
@@ -33,38 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config # Current configuration
+MENUDESC = "IEEE 802.15.4 applications"
 
-# Sub-directories
-
-SUBDIRS = $(dir $(wildcard */Makefile))
-
-all: nothing
-
-.PHONY: nothing context depend clean distclean preconfig
-
-define SDIR_template
-$(1)_$(2):
-	$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-endef
-
-$(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
-
-nothing:
-
-install:
-
-context: $(foreach SDIR, $(CNTXTDIRS), $(SDIR)_context)
-
-depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
-
-clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
-
-distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
-
- preconfig:
-
--include Make.dep
+include $(APPDIR)/Directory.mk