diff --git a/xCAT-nbroot/mkrpm b/xCAT-nbroot/mkrpm
index 24727db34..f505e6303 100755
--- a/xCAT-nbroot/mkrpm
+++ b/xCAT-nbroot/mkrpm
@@ -1,8 +1,14 @@
+#!/bin/sh
+if [ -f /etc/redhat-release ]
+then
+   pkg="redhat"
+else
+   pkg="packages"
+fi
 cd `dirname $0`
 tar --exclude .svn -czvf xcat-nbrootoverlay.tar.gz -C overlay/  .
-cp *.gz /usr/src/redhat/SOURCES
-cp xcat-core-nbroot.spec /usr/src/redhat/SPECS
-rm xcat-nbrootoverlay.tar.gz
-rpmbuild -ba /usr/src/redhat/SPECS/xcat-core-nbroot.spec --target $1
+mv -f *.gz /usr/src/$pkg/SOURCES
+cp xcat-core-nbroot.spec /usr/src/$pkg/SOURCES
+rpmbuild -ba xcat-core-nbroot.spec --target $1
 cd -
 
diff --git a/xCAT/mkrpm b/xCAT/mkrpm
index e46f5de46..a0e773bfe 100755
--- a/xCAT/mkrpm
+++ b/xCAT/mkrpm
@@ -1,8 +1,16 @@
+#!/bin/sh
+if [ -f /etc/redhat-release ]
+then
+   pkg="redhat"
+else
+   pkg="packages"
+fi
 cd `dirname $0`
 tar --exclude .svn -czvf postscripts.tar.gz  postscripts LICENSE.html
 tar --exclude .svn -czvf templates.tar.gz templates
-mv -f *.gz /usr/src/redhat/SOURCES
-cp xcat.conf /usr/src/redhat/SOURCES
+mv -f *.gz /usr/src/$pkg/SOURCES
+cp xcat.conf /usr/src/$pkg/SOURCES
+rm /usr/src/$pkg/RPMS/noarch/xCAT-2.0*rpm
 rpmbuild -ba xCAT.spec 
 cd -