diff --git a/llvm/tools/hpvm/llvm_patches/apply_patch.sh b/llvm/tools/hpvm/llvm_patches/apply_patch.sh
index 7fe4e80c2de0a79727233562e0524ded66305cbc..ea86575207a4aa7b4ca138b604f7423943924b22 100644
--- a/llvm/tools/hpvm/llvm_patches/apply_patch.sh
+++ b/llvm/tools/hpvm/llvm_patches/apply_patch.sh
@@ -1,7 +1,34 @@
 #!/bin/sh
 
 ### File Copies
-cp include/IR/IntrinsicsVISC.td  ../../../include/llvm/IR/IntrinsicsVISC.td
+cp include/IR/IntrinsicsVISC.td  ${LLVM_SRC_ROOT}/include/llvm/IR/IntrinsicsVISC.td
 
-## File Patches
-patch  /home/hsharif3/Github/llvm-project/llvm/include/llvm/IR/Attributes.td  <  ./include/IR/Attributes.td.patch 
+
+## Header File Patches
+patch  ${LLVM_SRC_ROOT}/include/llvm/IR/Attributes.td  <  ./include/IR/Attributes.td.patch 
+
+patch  ${LLVM_SRC_ROOT}/include/llvm/IR/Intrinsics.td  <  ./include/IR/Intrinsics.td.patch
+
+patch  ${LLVM_SRC_ROOT}/include/llvm/Bitcode/LLVMBitCodes.h  <  ./include/Bitcode/LLVMBitCodes.h.patch
+
+patch  ${LLVM_SRC_ROOT}/include/llvm/Support/Debug.h   <   ./include/Support/Debug.h.patch
+
+
+#### Patching Sources 
+
+
+patch  ${LLVM_SRC_ROOT}/lib/AsmParser/LLLexer.cpp   <  ./lib/AsmParser/LLLexer.cpp.patch 
+
+patch  ${LLVM_SRC_ROOT}/lib/AsmParser/LLLexer.h   <  ./lib/AsmParser/LLLexer.h.patch
+
+patch  ${LLVM_SRC_ROOT}/lib/AsmParser/LLParser.cpp   <   ./lib/AsmParser/LLParser.cpp.patch
+
+patch  ${LLVM_SRC_ROOT}/lib/AsmParser/LLParser.h   <   ./lib/AsmParser/LLParser.h.patch
+
+patch  ${LLVM_SRC_ROOT}/lib/AsmParser/LLToken.h   <   ./lib/AsmParser/LLToken.h.patch
+
+patch  ${LLVM_SRC_ROOT}/lib/IR/Attributes.cpp  <  ./lib/IR/Attributes.cpp.patch
+
+patch  ${LLVM_SRC_ROOT}/lib/Bitcode/Reader/BitcodeReader.cpp   <   ./lib/Bitcode/Reader/BitcodeReader.cpp.patch
+
+patch  ${LLVM_SRC_ROOT}/lib/Bitcode/Writer/BitcodeWriter.cpp  <   ./lib/Bitcode/Writer/BitcodeWriter.cpp.patch
diff --git a/llvm/tools/hpvm/llvm_patches/construct_patch.sh b/llvm/tools/hpvm/llvm_patches/construct_patch.sh
index e191308e952e3e4de7f079ba861a4339237c5114..4034b542f0f9aa45f31dd9e91d3b342252eb52e8 100644
--- a/llvm/tools/hpvm/llvm_patches/construct_patch.sh
+++ b/llvm/tools/hpvm/llvm_patches/construct_patch.sh
@@ -1,18 +1,16 @@
 #!/bin/sh
 
-#### Patching Headers
+#### Computing Header Diff
 diff -u  ../../../include/llvm/Bitcode/LLVMBitCodes.h  include/Bitcode/LLVMBitCodes.h > include/Bitcode/LLVMBitCodes.h.patch 
 
 diff -u  ../../../include/llvm/IR/Attributes.td   include/IR/Attributes.td   > include/IR/Attributes.td.patch
 
 diff -u  ../../../include/llvm/IR/Intrinsics.td   include/IR/Intrinsics.td > include/IR/Intrinsics.td.patch
 
-cp include/IR/IntrinsicsVISC.td  ../../../include/llvm/IR/IntrinsicsVISC.td 
-
 diff -u  ../../../include/llvm/Support/Debug.h   include/Support/Debug.h > include/Support/Debug.h.patch
 
 
-#### Patching Sources
+#### Computing Source File Diff
 
 diff -u  ../../../lib/AsmParser/LLLexer.cpp   lib/AsmParser/LLLexer.cpp > lib/AsmParser/LLLexer.cpp.patch