diff --git a/scripts/browserid.spec b/scripts/browserid.spec
index c0430e1b10764771263b6a2d3276ed3e52981f30..1e5dd80eb39cf47d7942da15d127883d313514ad 100644
--- a/scripts/browserid.spec
+++ b/scripts/browserid.spec
@@ -18,13 +18,12 @@ BuildRequires: gcc-c++ git jre make npm openssl-devel
 browserid server & web home for browserid.org
 
 %prep
-%setup -q -n browserid
+%setup -q -c -n browserid
 
 %build
-rm -rf node_modules/jwcrypto
 npm install
 export PATH=$PWD/node_modules/.bin:$PATH
-(scripts/compress.sh)
+scripts/compress.sh
 echo "$GIT_REVISION" > resources/static/ver.txt
 
 %install
diff --git a/scripts/rpmbuild.sh b/scripts/rpmbuild.sh
index 465ad047d6dd75291d20b927ac2ca5c5970cd253..e8fa67d5deaa9b10a54f948b8655e1322dec61c8 100755
--- a/scripts/rpmbuild.sh
+++ b/scripts/rpmbuild.sh
@@ -9,11 +9,9 @@ cd $(dirname $0)/..    # top level of the checkout
 mkdir -p rpmbuild/SOURCES rpmbuild/SPECS rpmbuild/SOURCES
 rm -rf rpmbuild/RPMS rpmbuild/SOURCES/browserid
 
-# work around the checkout name not being "browserid"
-ln -sf $PWD rpmbuild/SOURCES/browserid
-tar -C rpmbuild/SOURCES --exclude rpmbuild --exclude .git \
-    --exclude var -czhf \
-    $PWD/rpmbuild/SOURCES/browserid-server.tar.gz browserid/
+tar --exclude rpmbuild --exclude .git \
+    --exclude var -czf \
+    $PWD/rpmbuild/SOURCES/browserid-server.tar.gz .
 
 set +e