diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 89497c7ff..f4e75d092 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -36,7 +36,7 @@ administrators to centralize the configuration of Shorewall-based firewalls.
 export PREFIX=$RPM_BUILD_ROOT ; \
 export OWNER=`id -n -u` ; \
 export GROUP=`id -n -g` ;\
-./install.sh
+./install.sh -n
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 5d7a26b51..1e1244bd8 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -33,7 +33,7 @@ a multi-function gateway/ router/server or on a standalone GNU/Linux system.
 export PREFIX=$RPM_BUILD_ROOT ; \
 export OWNER=`id -n -u` ; \
 export GROUP=`id -n -g` ;\
-./install.sh
+./install.sh -n
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index c70e13f0c..f8520d6a2 100755
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -404,13 +404,19 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 	progress_message "Building $RPMNAME..."
 
 	test -n "$SIGN" && SIGN="--sign"
-	do_or_die "rpmbuild -tb $SIGN $TARBALL >> $LOGFILE 2>&1"
+	rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*}
+	do_or_die "cp shorewall-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
+	do_or_die "cp $SHOREWALLDIR/shorewall.spec $RPMDIR/SPECS/"
+	do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall.spec >> $LOGFILE 2>&1"
 	do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME .
 
 	if [ -n "$HASLITE" ]; then
 	    progress_message "Building $LITERPMNAME..."
 
-	    do_or_die "rpmbuild -tb $SIGN $LITETARBALL >> $LOGFILE 2>&1"
+	    rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*}
+	    do_or_die "cp shorewall-lite-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
+	    do_or_die "cp $SHOREWALLLITEDIR/shorewall-lite.spec $RPMDIR/SPECS/"
+	    do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-lite.spec >> $LOGFILE 2>&1"
 	    do_or_die cp -a $RPMDIR/RPMS/noarch/$LITERPMNAME .
 	fi
     fi