diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index 165302b6..03d837d5 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -1,28 +1,37 @@
-MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
-GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
-SUSE_RELEASE = $(shell sed '/VERSION *=/ !d; s/VERSION *= *//' /etc/SuSE-release)
-UPLOAD_URL = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr
-UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
+# === variable definitions
+MOD_SCRIPT_DIR          = $(MODDIR)/devutil/scripts
+GENERATE_SELECTION      = $(MOD_SCRIPT_DIR)/generate_selection.sh
+SUSE_RELEASE            = $(shell sed '/VERSION *             =/ !d; s/VERSION *             = *//' /etc/SuSE-release)
+UPLOAD_URL              = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr
+UPLOAD_SH               = $(MOD_SCRIPT_DIR)/upload.sh
 
-SELECTION = $(shell sh $(GENERATE_SELECTION) -s).txt
+SELECTION               = $(shell sh $(GENERATE_SELECTION) -s)-packages.txt
+CHANNEL_LIST            = $(shell sh $(GENERATE_SELECTION) -s)-channels.txt
 
-all: selection.done
+# === targets
+all: selection.done channels.done
+clean:
+	rm -rf *.done *.tmp
+distclean: clean
+install:
 upload: upload.done
+install-smart: rpm-install-smart.done
+blah:
+	echo SUSE_RELEASE=$(SUSE_RELEASE)
 
+# === rules
 selection.done:
 	rpm -qa --queryformat '%{NAME}\n' > $(SELECTION)
 	touch $@
 
-clean:
-	rm -rf $(SELECTION) *.done *.tmp
-
-upload.done: selection.done
-	sh $(UPLOAD_SH) $< $(UPLOAD_URL)
-	ssh -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh
+channels.done:
+	smart channel --show > $(CHANNEL_LIST)
 	touch $@
 
-blah:
-	echo SUSE_RELEASE=$(SUSE_RELEASE)
+upload.done: selection.done
+	sh $(UPLOAD_SH) $(SELECTION) $(CHANNEL_LIST) $(UPLOAD_URL)
+	ssh -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh
+	touch $@
 
 rpm-install-smart.done:
 	if ! rpm -q smart >/dev/null 2>&1 ; then \
@@ -31,4 +40,3 @@ rpm-install-smart.done:
 	fi
 	touch $@
 
-install-smart: rpm-install-smart.done