diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk
index 6ef7ab75..31076ed6 100644
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@@ -112,7 +112,8 @@ $(D)/kernel-armbox: $(D)/kernel.do_compile
 
 # -----------------------------------------------------------------------------
 
-kernel-modules-coolstream: kernel-modules-coolstream-$(BOXSERIES)
+$(D)/kernel-modules-coolstream: $(D)/kernel-modules-coolstream-$(BOXSERIES)
+	$(TOUCH)
 
 STRIP-MODULES-COOLSTREAM-HD1  =
 STRIP-MODULES-COOLSTREAM-HD1 += kernel/drivers/mtd/devices/mtdram.ko
@@ -126,28 +127,31 @@ STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/autofs4/autofs4.ko
 STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/cifs/cifs.ko
 STRIP-MODULES-COOLSTREAM-HD1 += kernel/fs/fuse/fuse.ko
 
-kernel-modules-coolstream-hd1: kernel-coolstream
+$(D)/kernel-modules-coolstream-hd1: $(D)/kernel-coolstream
 	for module in $(STRIP-MODULES-COOLSTREAM-HD1); do \
 		mkdir -p $(TARGET_MODULES_DIR)/$$(dirname "$$module"); \
 		$(TARGET)-objcopy --strip-unneeded $(KERNEL_MODULES_DIR)/$$module $(TARGET_MODULES_DIR)/$$module; \
 	done;
 	rm -f $(TARGET_MODULES_DIR)/usb-storage.ko # already builtin
 	make depmod
+	$(TOUCH)
 
-kernel-modules-coolstream-hd2: kernel-coolstream
+$(D)/kernel-modules-coolstream-hd2: $(D)/kernel-coolstream
 	rm -rf $(TARGET_MODULES_DIR)/kernel # nuke coolstream kernel-drivers but leave coolstream extra-drivers
 	cp -a $(KERNEL_MODULES_DIR)/kernel $(TARGET_MODULES_DIR) # copy own kernel-drivers
 	cp -a $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR)
 	cp -a $(KERNEL_MODULES_DIR)/modules.order $(TARGET_MODULES_DIR)
 	make depmod
 	make rtl8192eu
+	$(TOUCH)
 
-kernel-modules-armbox: kernel-armbox
+$(D)/kernel-modules-armbox: $(D)/kernel-armbox
 	cp -a $(KERNEL_MODULES_DIR)/kernel $(TARGET_MODULES_DIR)
 	cp -a $(KERNEL_MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR)
 	cp -a $(KERNEL_MODULES_DIR)/modules.order $(TARGET_MODULES_DIR)
 	make depmod
 	make rtl8192eu
+	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index 2abbc8ea..fce1aba6 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -3,19 +3,22 @@
 #
 # -----------------------------------------------------------------------------
 
-plugins-all: $(D)/neutrino $(D)/neutrino-plugins \
-	logo-addon \
-	neutrino-mediathek \
-	doscam-webif-skin
+plugins: \
+	$(D)/neutrino-plugins \
+	$(D)/logo-addon \
+	$(D)/neutrino-mediathek \
+	$(D)/doscam-webif-skin
+	make plugins-$(BOXSERIES)
 
-plugins-hd1: # nothing to do
+plugins-hd1:
+	# nothing to do
 
 plugins-hd2 \
 plugins-hd51: \
-	channellogos
-  ifneq ($(BOXMODEL), kronos_v2)
+	$(D)/channellogos
+ifneq ($(BOXMODEL), kronos_v2)
 	make links
-  endif
+endif
 
 # -----------------------------------------------------------------------------
 
@@ -65,7 +68,7 @@ $(NP_OBJ_DIR)/config.status: $(NP_DEPS)
 
 # -----------------------------------------------------------------------------
 
-$(D)/neutrino-plugins: $(NP_OBJ_DIR)/config.status
+$(D)/neutrino-plugins: $(D)/neutrino $(NP_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	$(MAKE) -C $(NP_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
 	$(MAKE) -C $(NP_OBJ_DIR) install DESTDIR=$(TARGET_DIR)
@@ -180,10 +183,11 @@ $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).
 
 # -----------------------------------------------------------------------------
 
-PHONY += plugins-all
+PHONY += plugins
 PHONY += plugins-hd1
 PHONY += plugins-hd2
 PHONY += plugins-hd51
+
 PHONY += neutrino-plugins-uninstall neutrino-plugins-distclean
 PHONY += neutrino-plugins-clean neutrino-plugins-clean-all
 PHONY += neutrino-plugin-%
diff --git a/make/ni.mk b/make/ni.mk
index 26cfe042..174a98eb 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -23,8 +23,7 @@ ni-image:
 	@echo "starting 'make $@' build with "$(PARALLEL_JOBS)" threads!"
 	$(MAKE) kernel-modules-$(BOXTYPE)
 	$(MAKE) neutrino
-	make plugins-all
-	make plugins-$(BOXSERIES)
+	$(MAKE) plugins
 	make fbshot
 	$(MAKE) lcd4linux
 	$(MAKE) luacurl