diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index 03d837d5..423ecb66 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -1,30 +1,34 @@
 # === variable definitions
 MOD_SCRIPT_DIR          = $(MODDIR)/devutil/scripts
+GET_OS_SH               = $(MOD_SCRIPT_DIR)/get_os.sh
 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
 
+DISTRIBUTOR             = $(shell $(GET_OS_SH) | cut -d- -f1)
+DISTRO_RELEASE          = $(shell $(GET_OS_SH) | cut -d- -f2-)
+UPLOAD_URL              = root@ftp.jannet.de:/home/ftp/dat/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/setup/descr
+
 SELECTION               = $(shell sh $(GENERATE_SELECTION) -s)-packages.txt
 CHANNEL_LIST            = $(shell sh $(GENERATE_SELECTION) -s)-channels.txt
 
 # === targets
 all: selection.done channels.done
+install:
 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)
+selection.done: $(MODDIR)/make/smart-selection.mk
+	rpm -qa --queryformat '%{NAME}\n' | \
+	sed ' \
+		/gpg-pubkey/ d \
+	' > $(SELECTION)
 	touch $@
 
-channels.done:
+channels.done: $(MODDIR)/make/smart-selection.mk
 	smart channel --show > $(CHANNEL_LIST)
 	touch $@
 
@@ -35,8 +39,10 @@ upload.done: selection.done
 
 rpm-install-smart.done:
 	if ! rpm -q smart >/dev/null 2>&1 ; then \
-		wget ftp.jannet.de:/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/rpm/i686/smart.rpm; \
+		wget ftp.jannet.de:/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/rpm/i686/smart.rpm; \
 		sudo rpm -U smart.rpm; \
 	fi
 	touch $@
 
+install-packages:
+	cat $(SELECTION) | xargs sudo smart install -y