diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index aaf525cc..165302b6 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -1,4 +1,4 @@
-MOD_SCRIPT_DIR = $(MODDIR)/lib/devutil/scripts
+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
@@ -6,17 +6,17 @@ UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
 
 SELECTION = $(shell sh $(GENERATE_SELECTION) -s).txt
 
-all: $(SELECTION)
+all: selection.done
 upload: upload.done
 
-$(SELECTION):
-	rpm -qa --queryformat '%{NAME}' > $@.tmp
-	if diff $@ $@.tmp >/dev/null 2>&1; then mv $@.tmp $@; else rm -f $@.tmp; fi
+selection.done:
+	rpm -qa --queryformat '%{NAME}\n' > $(SELECTION)
+	touch $@
 
 clean:
-	rm -rf $(SELECTION) upload.done
+	rm -rf $(SELECTION) *.done *.tmp
 
-upload.done: $(SELECTION)
+upload.done: selection.done
 	sh $(UPLOAD_SH) $< $(UPLOAD_URL)
 	ssh -l root ftp.jannet.de /etc/cron.hourly/create_packet_descriptions.sh
 	touch $@
@@ -24,11 +24,11 @@ upload.done: $(SELECTION)
 blah:
 	echo SUSE_RELEASE=$(SUSE_RELEASE)
 
-install-smart.done:
-	if ! rpm -q smarti >/dev/null 2>&1 ; then \
-		wget ftp.jannet.de:/pub/packages/linux/suse/10.1/inst-source/rpm/i686/smart.rpm; \
+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; \
 		sudo rpm -U smart.rpm; \
 	fi
 	touch $@
 
-install-smart: install-smart.done
+install-smart: rpm-install-smart.done