diff --git a/qla2x00t-32gbit/extract-qla2xxx-orig b/qla2x00t-32gbit/extract-qla2xxx-orig
index 59aba4837..0d4093939 100755
--- a/qla2x00t-32gbit/extract-qla2xxx-orig
+++ b/qla2x00t-32gbit/extract-qla2xxx-orig
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../scripts/kernel-functions
+source "$(dirname "$0")/../scripts/kernel-functions" || exit $?
 
 #########################
 # Argument verification #
diff --git a/qla2x00t-32gbit/generate-in-tree-patches b/qla2x00t-32gbit/generate-in-tree-patches
index 9b8c8d2ce..de1c34244 100755
--- a/qla2x00t-32gbit/generate-in-tree-patches
+++ b/qla2x00t-32gbit/generate-in-tree-patches
@@ -8,7 +8,7 @@ if [ "$1" = "" ]; then
 fi
 
 if [ ! -e qla2xxx-orig/$1 ]; then
-  ./extract-qla2xxx-orig "$1"
+  "$(dirname "$0")/extract-qla2xxx-orig" "$1"
 fi
 
 mkdir -p in-tree-patches/"${kernel_version}"
diff --git a/qla2x00t/extract-qla2xxx-orig b/qla2x00t/extract-qla2xxx-orig
index ac9d5f0b4..6755c0e04 100755
--- a/qla2x00t/extract-qla2xxx-orig
+++ b/qla2x00t/extract-qla2xxx-orig
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../scripts/kernel-functions
+source "$(dirname "$0")/../scripts/kernel-functions" || exit $?
 
 #########################
 # Argument verification #
diff --git a/qla2x00t/generate-in-tree-patches b/qla2x00t/generate-in-tree-patches
index 239484e8a..f3dda0f7a 100755
--- a/qla2x00t/generate-in-tree-patches
+++ b/qla2x00t/generate-in-tree-patches
@@ -8,7 +8,7 @@ if [ "$1" = "" ]; then
 fi
 
 if [ ! -e qla2xxx-orig/$1 ]; then
-  ./extract-qla2xxx-orig "$1"
+  "$(dirname "$0")/extract-qla2xxx-orig" "$1"
 fi
 
 mkdir -p in-tree-patches/"${kernel_version}"
diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 1d44badf5..fc5b5d700 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -507,7 +507,7 @@ add_file "iscsi-scst/README_in-tree" "Documentation/scst/README.iscsi" \
 
 if [ "${qla2x00t}" = "true" ]; then
 
-  ( cd qla2x00t && ./generate-in-tree-patches "$1" )
+  ( cd qla2x00t && "$PWD/generate-in-tree-patches" "$1" )
 
   for f in qla2x00t/in-tree-patches/"$1"/*.patch; do
     [ -e "$f" ] || continue
@@ -533,7 +533,7 @@ if [ "${qla2x00t}" = "true" ]; then
 
 elif [ "${qla2x00t_32gbit}" = "true" ]; then
 
-  ( cd qla2x00t-32gbit && ./generate-in-tree-patches "$1" )
+  ( cd qla2x00t-32gbit && "$PWD/generate-in-tree-patches" "$1" )
 
   for f in qla2x00t-32gbit/in-tree-patches/"$1"/*.patch; do
     [ -e "$f" ] || continue