diff --git a/Makefile.common b/Makefile.common
index 5c004bc..e6caa1f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -89,8 +89,8 @@ RPM_BUILD_DIR ?= $(BUILDDIR)/$(NAME)-$(VERSION)
 #needed for archivefile rule
 TREEPATH := $(NAME)-$(VERSION)
 TREEPATH := $(NAME)-$(VERSION)
-EXT := $(shell cat $(NAME).spec | grep Source | sed 's/Source: //' | sed -E 's/^([^.]*\.)(.*)$/\2//')
-ARCHIVEFILE := $(shell cat $(NAME).spec | grep Source | sed -r 's/^Source[0..9]*:\s*//' | xargs basename)
+EXT := $(shell cat $(NAME).spec | grep Source | head -n 1 | sed 's/Source: //' | sed -E 's/^([^.]*\.)(.*)$/\2//')
+ARCHIVEFILE := $(shell cat $(NAME).spec | grep Source | head -n 1 | sed -r 's/^Source[0..9]*:\s*//' | xargs basename)
 ARCHIVEFILE := $(shell rpm --queryformat '$(ARCHIVEFILE)\n' --specfile $(NAME).spec | head -n 1)
 TEMPDIR := $(shell mktemp -d)
 
@@ -160,7 +160,8 @@ PREP_ARCHES	= $(addprefix prep-,$(ARCHES))
 
 # The TARGETS define is meant for local module targets that should be
 # made in addition to the SOURCEFILES whenever needed
-TARGETS		?= archivefile
+# TARGETS		?= archivefile
+TARGETS		?= 
 
 # default target - retrieve the sources and make the module specific targets
 sources: $(SOURCEFILES) $(TARGETS)