diff --git a/qla2x00t-32gbit/extract-qla2xxx-orig b/qla2x00t-32gbit/extract-qla2xxx-orig
index ac9d5f0b4..59aba4837 100755
--- a/qla2x00t-32gbit/extract-qla2xxx-orig
+++ b/qla2x00t-32gbit/extract-qla2xxx-orig
@@ -18,7 +18,12 @@ cd qla2xxx-orig || exit $?
 download_and_extract_kernel_tree "${kernel_version}"
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
-mkdir -p "${kernel_version}"
+mkdir -p "${kernel_version}/include/trace/events"
 mv "linux-${kernel_version}"/drivers/scsi/qla2xxx/* "${kernel_version}"
+if [ -e "linux-${kernel_version}"/include/trace/events/qla.h ]; then
+    touch "linux-${kernel_version}"/include/trace/events/qla.h
+    mv "linux-${kernel_version}"/include/trace/events/qla.h \
+       "${kernel_version}/include/trace/events"
+fi
 rm -rf "linux-${kernel_version}"
 cd ..
diff --git a/qla2x00t-32gbit/generate-in-tree-patches b/qla2x00t-32gbit/generate-in-tree-patches
index 239484e8a..9b8c8d2ce 100755
--- a/qla2x00t-32gbit/generate-in-tree-patches
+++ b/qla2x00t-32gbit/generate-in-tree-patches
@@ -26,6 +26,19 @@ for g in Kconfig *.[ch]; do
   fi
 done
 
+for g in include/trace/events/qla.h; do
+  f1="qla2xxx-orig/${kernel_version}/$g"
+  f2="$g"
+  f3="in-tree-patches/${kernel_version}/${g#include/trace/events/}.patch"
+  if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then
+    if [ -e "$f1" ]; then
+      diff -up "$f1" "$f2" > "$f3"
+    else
+      diff -up /dev/null "$f2" > "$f3"
+    fi
+  fi
+done
+
 for g in Makefile; do
   f1="qla2xxx-orig/${kernel_version}/$g"
   f2="${g}_in-tree"