diff --git a/RPM/Makefile.am b/RPM/Makefile.am
index 7157204..2c7ca03 100644
--- a/RPM/Makefile.am
+++ b/RPM/Makefile.am
@@ -1 +1,2 @@
 EXTRA_DIST = build_rpm.in nuq.spec.in
+CLEANFILES = -r BUILD RPMS SOURCES SPECS SRPMS rpmmacros
diff --git a/RPM/build_rpm.in b/RPM/build_rpm.in
index 27c3856..8dde53a 100644
--- a/RPM/build_rpm.in
+++ b/RPM/build_rpm.in
@@ -1,17 +1,14 @@
-#!/bin/sh -x
+#!/bin/sh -ex
 
 version=@VERSION@
 temp_dir=/var/tmp
 srcdir=@srcdir@
-if [ "$srcdir" = "." ]; then
-    srcdir=..
-fi
 
 rm -rf BUILD SPECS RPMS SOURCES SRPMS
 mkdir -p BUILD SPECS RPMS/{noarch,i386,i686} SOURCES SRPMS
-(cd ${srcdir}; make dist)
-mv ${srcdir}/nuq-${version}.tar.gz SOURCES
+(cd ..; make dist)
+(cd SOURCES; ln -s ../../nuq-${version}.tar.gz .)
 cat > rpmmacros <<EOF
 %_topdir $PWD
 EOF
-rpm -ba nuq.spec --rcfile rpmrc
+rpm -ba nuq.spec --rcfile ${srcdir}/rpmrc