diff --git a/build/Makefile b/build/Makefile
index 171499203..eace5f6c8 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -140,8 +140,8 @@ package-rpm-%: folder-%
 	sed -i "s/@VERSION@/$($*_version)/" SPECS/$*.spec
 	sed -i "s/@BUILD_NUMBER@/$(BUILD_NUMBER)/" SPECS/$*.spec
 
-	rpmbuild -bb SPECS/$*.spec
-	./sign RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm
+	rpmbuild -bb SPECS/$*.spec --define "_topdir `pwd`" --define "_tmppath `pwd`/tmp"
+	./sign RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm "$(gpg_key)" "`which gpg`"
 	rpm -Kv RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm
 	@echo "*** Packaged RPM $* version $($*_version)"
 
diff --git a/build/rpmmacros b/build/rpmmacros
deleted file mode 100644
index 6af30c890..000000000
--- a/build/rpmmacros
+++ /dev/null
@@ -1,6 +0,0 @@
-%_topdir %(echo $WORKSPACE)/tools/build
-%_tmppath %(echo $WORKSPACE)/tools/build/tmp
-%_signature gpg
-%_gpg_name 2122CBE9
-%_gpgbin /usr/bin/gpg
-
diff --git a/build/sign b/build/sign
index 138f18ec4..0371b5d4b 100755
--- a/build/sign
+++ b/build/sign
@@ -1,15 +1,17 @@
 #!/usr/bin/expect -f
 set timeout 3
 set PACKAGE [lindex $argv 0]
+set GPG_NAME [lindex $argv 1]
+set GPG_PATH [lindex $argv 2]
 set GPG_PASSPHRASE $env(GPG_PASSPHRASE)
 
 if {[llength $argv] == 0} {
-  send_user "Usage: ./sign <rpm_package>\n"
+  send_user "Usage: ./sign <rpm_package> <gpg_key> <gpg_binary>\n"
   exit 1
 }
 
 send_user "\nSigning $PACKAGE\n"
-spawn rpmsign --resign $PACKAGE
+spawn rpmsign --resign $PACKAGE --define "_signature gpg" --define "_gpg_name $GPG_NAME" --define "_gpgbin $GPG_PATH"
 expect {
   timeout { send_user "\nTimeout signing $PACKAGE\n"; exit 1 }
   "Enter pass phrase:"