diff --git a/tools/build/build44 b/tools/build/build44
index 22d6db6c8..e20c89942 100755
--- a/tools/build/build44
+++ b/tools/build/build44
@@ -48,6 +48,7 @@
 # XSL Stylesheet to use for XML->HTML conversion
 #
 STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
+STYLESHEET=/usr/share/docbook-xsl/xhtml/docbook.xsl
 #
 # Directory where the build log will be placed. The log has the name
 # shorewall_build_<version>.log
@@ -166,7 +167,7 @@ list_search() # $1 = element to search for , $2-$n = list
 # It's easy to mis-type the GPG passphrase; this function allows us additional chances to get it right
 #
 do_rpmbuild() {
-    while ! rpmbuild $@ >> $LOGFILE 2>&1; do
+    while ! rpmbuild --target noarch-linux $@ >> $LOGFILE 2>&1; do
 	echo    "rpmbuild $@ failed" >&2
 	echo -n "Retry? Y/n " >&2
 	read response
@@ -276,7 +277,7 @@ case $1 in
 	BUILD6LITE=Yes
 
 	done=Yes
-	SIGN=Yes
+	SIGN=
 	;;
 esac
 
diff --git a/tools/build/upload44 b/tools/build/upload44
index e993b3854..3a7263089 100755
--- a/tools/build/upload44
+++ b/tools/build/upload44
@@ -181,4 +181,15 @@ base=
 
 [ -n "$BASE" ] && $COMMAND $base $DEST/base
 
+rpms=$(
+    for f in $files; do
+	case $f in
+	    *.rpm)
+		echo $f
+		;;
+	esac
+    done)
+
+[ -n "$rpms" ] && rpm --resign $files
+
 $COMMAND -r $files $DEST