diff --git a/bin/hipcc b/bin/hipcc
index b491f34665..946f5abe68 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -157,7 +157,8 @@ if ($HIP_PLATFORM eq "hcc") {
     exit (-1);
 }
 
-my $ISACMD="hipgenisa.sh ";
+my $ISACMD=$HIP_PATH;
+$ISACMD .= "/bin/hipgenisa.sh ";
 $ISACMD .= $ROCM_PATH;
 if($ARGV[0] eq "--genisa"){
   foreach $isaarg (@ARGV){
diff --git a/bin/hipgenisa.sh b/bin/hipgenisa.sh
index ef5417a428..496e79e34c 100755
--- a/bin/hipgenisa.sh
+++ b/bin/hipgenisa.sh
@@ -18,9 +18,11 @@ fi
 
 export KMDUMPISA=1
 export KMDUMPLLVM=1
+mkdir /tmp/hipgenisa
 hipcc $FILE_NAMES -o /tmp/hipgenisa/a.out
 mv dump.* /tmp/hipgenisa/
 ${ROCM_PATH}/hcc-lc/bin/llvm-mc -arch=amdgcn -mcpu=$TARGET -filetype=obj /tmp/hipgenisa/dump.isa -o /tmp/hipgenisa/dump.o
 ${ROCM_PATH}/llvm/bin/clang -target amdgcn--amdhsa /tmp/hipgenisa/dump.o -o $OUTPUT_FILE
+rm -r /tmp/hipgenisa
 export KMDUMPISA=0
 export KMDUMPLLVM=0