diff --git a/makerpm b/makerpm
index 91c17b5fa..13d0dc7c2 100755
--- a/makerpm
+++ b/makerpm
@@ -147,8 +147,8 @@ function makegenesisscripts {
 
 	RPMNAME="$1"
 	ARCH="$2"
-	cd `dirname $0`/$DIR
-	tar --exclude .svn -cjf $RPMROOT/SOURCES/$RPMNAME.tar.bz2 .
+	cd `dirname $0`/
+	tar --exclude .svn -cjf $RPMROOT/SOURCES/$RPMNAME.tar.bz2 $DIR
 	cp LICENSE.html $RPMROOT/BUILD
 	cp $RPMNAME.spec $RPMROOT/SOURCES
 	cd - >/dev/null
diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index 632408bfc..c8fbfde30 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -3,7 +3,7 @@ echo $drivers
 dracut_install wget openssl tar mstflint ipmitool cpio gzip lsmod ethtool modprobe touch echo cut wc
 dracut_install netstat # broadcom update requires
 dracut_install uniq # mellanox update requires
-dracut_install grep ip hostname awk egrep grep dirname expr
+dracut_install grep ip hostname /usr/bin/awk egrep grep dirname expr
 dracut_install mount.nfs sshd vi reboot lspci parted screen mkfs mkfs.ext4 mkfs.btrfs
 dracut_install efibootmgr
 #dracut_install libvirtd /usr/share/libvirt/cpu_map.xml /usr/bin/qemu-img /usr/libexec/qemu-kvm
diff --git a/xCAT-genesis-scripts/bin/allowcred.awk b/xCAT-genesis-scripts/bin/allowcred.awk
index 341138d3e..a5507750b 100755
--- a/xCAT-genesis-scripts/bin/allowcred.awk
+++ b/xCAT-genesis-scripts/bin/allowcred.awk
@@ -1,4 +1,4 @@
-#!/usr/bin/awk -f
+#!/bin/awk -f
 BEGIN {
         listener = "/inet/tcp/300/0/0"
         quit = "no"
diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/bin/doxcat
index 9f682a20d..844d2300b 100755
--- a/xCAT-genesis-scripts/bin/doxcat
+++ b/xCAT-genesis-scripts/bin/doxcat
@@ -1,3 +1,8 @@
+modprobe acpi_cpufreq
+modprobe cpufreq_ondemand
+for gov in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
+	echo -n ondemand > $gov
+done
 if [ ! -z "$BOOTIF" ]; then
 	BOOTIF=`echo $BOOTIF|sed -e s/01-// -e s/-/:/g`
 	echo -n "Waiting for device with address $BOOTIF to appear.."
diff --git a/xCAT-genesis-scripts/bin/minixcatd.awk b/xCAT-genesis-scripts/bin/minixcatd.awk
index 5f71623a2..47e756bcd 100755
--- a/xCAT-genesis-scripts/bin/minixcatd.awk
+++ b/xCAT-genesis-scripts/bin/minixcatd.awk
@@ -1,4 +1,4 @@
-#!/usr/bin/awk -f
+#!/bin/awk -f
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 BEGIN {
 	port = 3001
diff --git a/xCAT-genesis-scripts/bin/udpcat.awk b/xCAT-genesis-scripts/bin/udpcat.awk
index 6a3c2c166..3abbd1315 100755
--- a/xCAT-genesis-scripts/bin/udpcat.awk
+++ b/xCAT-genesis-scripts/bin/udpcat.awk
@@ -1,4 +1,4 @@
-#!/usr/bin/awk -f
+#!/bin/awk -f
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 BEGIN {
   xcatdport = ARGV[2]
diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
index 00dedc561..1a3a895dd 100644
--- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
+++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
@@ -30,7 +30,7 @@ License: EPL
 Vendor: IBM Corp
 Summary: xCAT Genesis netboot image - Core content
 URL:	 http://xcat.org
-Source1: xCAT-genesis-scripts-%{version}.tar.bz2
+Source1: xCAT-genesis-scripts.tar.bz2
 Requires: xCAT-genesis-base-%{tarch}
 
 Buildroot: %{_localstatedir}/tmp/xCAT-genesis