diff --git a/qla2x00t-32gbit/extract-qla2xxx-orig b/qla2x00t-32gbit/extract-qla2xxx-orig
index 0d4093939..c969fbf49 100755
--- a/qla2x00t-32gbit/extract-qla2xxx-orig
+++ b/qla2x00t-32gbit/extract-qla2xxx-orig
@@ -15,7 +15,8 @@ fi
 
 mkdir -p qla2xxx-orig
 cd qla2xxx-orig || exit $?
-download_and_extract_kernel_tree "${kernel_version}"
+download_and_extract_kernel_tree "${kernel_version}" || exit $?
+kernel_version=${kernel_version/^*}
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
 mkdir -p "${kernel_version}/include/trace/events"
diff --git a/qla2x00t-32gbit/generate-in-tree-patches b/qla2x00t-32gbit/generate-in-tree-patches
index de1c34244..bcc5db2eb 100755
--- a/qla2x00t-32gbit/generate-in-tree-patches
+++ b/qla2x00t-32gbit/generate-in-tree-patches
@@ -2,15 +2,17 @@
 
 kernel_version="$1"
 
-if [ "$1" = "" ]; then
+if [ "$kernel_version" = "" ]; then
   echo "Error: missing kernel version argument."
   exit 1
 fi
 
-if [ ! -e qla2xxx-orig/$1 ]; then
-  "$(dirname "$0")/extract-qla2xxx-orig" "$1"
+if [ ! -e qla2xxx-orig/${kernel_version/^*} ]; then
+  "$(dirname "$0")/extract-qla2xxx-orig" "$kernel_version" || exit $?
 fi
 
+kernel_version=${kernel_version/^*}
+
 mkdir -p in-tree-patches/"${kernel_version}"
 
 for g in Kconfig *.[ch]; do
diff --git a/qla2x00t/extract-qla2xxx-orig b/qla2x00t/extract-qla2xxx-orig
index 6755c0e04..2f9e8c3cf 100755
--- a/qla2x00t/extract-qla2xxx-orig
+++ b/qla2x00t/extract-qla2xxx-orig
@@ -15,7 +15,8 @@ fi
 
 mkdir -p qla2xxx-orig
 cd qla2xxx-orig || exit $?
-download_and_extract_kernel_tree "${kernel_version}"
+download_and_extract_kernel_tree "${kernel_version}" || exit $?
+kernel_version=${kernel_version/^*}
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
 mkdir -p "${kernel_version}"
diff --git a/qla2x00t/generate-in-tree-patches b/qla2x00t/generate-in-tree-patches
index f3dda0f7a..5d57317a1 100755
--- a/qla2x00t/generate-in-tree-patches
+++ b/qla2x00t/generate-in-tree-patches
@@ -2,15 +2,17 @@
 
 kernel_version="$1"
 
-if [ "$1" = "" ]; then
+if [ "$kernel_version" = "" ]; then
   echo "Error: missing kernel version argument."
   exit 1
 fi
 
-if [ ! -e qla2xxx-orig/$1 ]; then
-  "$(dirname "$0")/extract-qla2xxx-orig" "$1"
+if [ ! -e qla2xxx-orig/${kernel_version/^*} ]; then
+  "$(dirname "$0")/extract-qla2xxx-orig" "$kernel_version" || exit $?
 fi
 
+kernel_version=${kernel_version/^*}
+
 mkdir -p in-tree-patches/"${kernel_version}"
 
 for g in Kconfig *.[ch]; do