diff --git a/buildcore.sh b/buildcore.sh
index 9d2eacb9c..b8d96f562 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -148,7 +148,7 @@ if $GREP xCAT-IBMhpc $SVNUP; then
    rm -f $DESTDIR/xCAT-IBMhpc*rpm
    rm -f $SRCDIR/xCAT-IBMhpc*rpm
    ./makehpcrpm
-   mv $source/RPMS/noarch/xCAT-IBMhpc-$VER*rpm $DESTDIR
+   mv $source/RPMS/$NOARCH/xCAT-IBMhpc-$VER*rpm $DESTDIR
    mv $source/SRPMS/xCAT-IBMhpc-$VER*rpm $SRCDIR
 fi
 # Do not automatically install xCAT-IBMhpc on AIX
diff --git a/makehpcrpm b/makehpcrpm
index 699cbc826..6171aebb0 100755
--- a/makehpcrpm
+++ b/makehpcrpm
@@ -19,7 +19,7 @@ then
     tar -X /tmp/xcat-excludes -cf $source/SOURCES/xCAT-IBMhpc-$VER.tar xCAT-IBMhpc
     gzip -f $source/SOURCES/xCAT-IBMhpc-$VER.tar
     rm -f $source/SRPMS/xCAT-IBMhpc-$VER*rpm $source/RPMS/ppc/xCAT-IBMhpc-$VER*rpm
-    rpm -ba xCAT-server/xCAT-IBMhpc.spec
+    rpm -ba xCAT-IBMhpc/xCAT-IBMhpc.spec
     #rpm -ta $source/SOURCES/xCAT-IBMhpc-$VER.tar.gz
 
 else