diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 036a9202..87d3489d 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -36,7 +36,8 @@ PCKG_RPM_SRC             ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
 include $(MODDIR)/make/upload-defs.mk
 
 DIST_FILES                = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
-
+GENERATED                 = $(sort $(shell find . -name '*.in' | \
+	sed "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
 RPMS_DIR                  = /usr/src/packages/RPMS/$(RPM_ARCH)
 SRPMS_DIR                 = /usr/src/packages/SRPMS
 DIST_DIRS                 = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
@@ -92,7 +93,7 @@ cpfiles.dist:
 
 %.tar.gz: cpfiles.dist cpmod.dist
 	mkdir -p $(DIST_PCKG_DIR)
-	tar $(addprefix --exclude=,$(patsubst %,"%",$(basename $(shell find . -name *.in | sed 's%\./%*/%; s%\(.*\)%\1%g')))) \
+	tar --anchored $(addprefix --exclude=,$(GENERATED))\
 		-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
 
 %.src.rpm: %.tar.gz
@@ -134,3 +135,7 @@ upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
 update-repo.dist: upload.dist
 	ssh -l root $(FTP_HOST) /etc/cron.hourly/create_packet_descriptions.sh
 	touch $@
+
+echo-generated:
+	@echo GENERATED = $(GENERATED)
+