diff --git a/package/channellogos/channellogos.mk b/package/channellogos/channellogos.mk
index 375e2f22..d7cdfb10 100644
--- a/package/channellogos/channellogos.mk
+++ b/package/channellogos/channellogos.mk
@@ -4,12 +4,33 @@
 #
 ################################################################################
 
-channellogos: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(SHARE_ICONS)
+CHANNELLOGOS_VERSION = ni-git
+CHANNELLOGOS_DIR = $(NI_LOGO_STUFF)
+CHANNELLOGOS_SOURCE = $(NI_LOGO_STUFF)
+CHANNELLOGOS_SITE = https://github.com/neutrino-images
+
+define CHANNELLOGOS_REMOVE_LOGODIR
 	rm -rf $(SHARE_LOGOS)
+endef
+CHANNELLOGOS_INDIVIDUAL_HOOKS += CHANNELLOGOS_REMOVE_LOGODIR
+
+define CHANNELLOGOS_INSTALL_CHANNELLOGOS
 	$(INSTALL) -d $(SHARE_LOGOS)
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos/* $(SHARE_LOGOS)
-	$(INSTALL) -d $(SHARE_LOGOS)/events
-	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos-events/* $(SHARE_LOGOS)/events
-	$(CD) $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-links; \
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/logos/* $(SHARE_LOGOS)
+endef
+CHANNELLOGOS_INDIVIDUAL_HOOKS += CHANNELLOGOS_INSTALL_CHANNELLOGOS
+
+define CHANNELLOGOS_LINK_CHANNELLOGOS
+	$(CD) $(PKG_BUILD_DIR)/logo-links; \
 		./logo-linker.sh logo-links.db $(SHARE_LOGOS)
-	$(TOUCH)
+endef
+CHANNELLOGOS_INDIVIDUAL_HOOKS += CHANNELLOGOS_LINK_CHANNELLOGOS
+
+define CHANNELLOGOS_INSTALL_EVENTLOGOS
+	$(INSTALL) -d $(SHARE_LOGOS)/events
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/logos-events/* $(SHARE_LOGOS)/events
+endef
+CHANNELLOGOS_INDIVIDUAL_HOOKS += CHANNELLOGOS_INSTALL_EVENTLOGOS
+
+channellogos: | $(TARGET_DIR)
+	$(call individual-package)