diff --git a/qla2x00t-32gbit/Makefile b/qla2x00t-32gbit/Makefile
index c72950dc7..30c8bec05 100644
--- a/qla2x00t-32gbit/Makefile
+++ b/qla2x00t-32gbit/Makefile
@@ -75,4 +75,4 @@ extraclean: clean
 endif
 
 release-archive:
-	../scripts/generate-release-archive qla2x00t "$$(sed -n 's/^#define[[:blank:]]Q2T_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' qla2x00-target/qla2x00t.h)"
+	../scripts/generate-release-archive qla2x00t-32gbit "$$(sed -n 's/^#define[[:blank:]]Q2T_VERSION_STRING[[:blank:]]*\"\([^\"]*\)\".*/\1/p' qla2x00-target/scst_qla2xxx.h)"
diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.h b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.h
index f49c45e9a..a3bf6557f 100644
--- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.h
+++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.h
@@ -17,6 +17,11 @@
 #include <linux/sbitmap.h>
 #endif
 
+/* Driver version number */
+#define Q2T_VERSION(a, b, c, d)	(((a) << 030) + ((b) << 020) + (c) << 010 + (d))
+#define Q2T_VERSION_CODE	Q2T_VERSION(3, 5, 0, 0)
+#define Q2T_VERSION_STRING	"3.5.0"
+
 #define SQA_DEFAULT_TAGS 2048
 
 extern size_t qlt_add_vtarget(u64, u64, u64);
diff --git a/scripts/update-version b/scripts/update-version
index ff57e280b..aa1107b7b 100755
--- a/scripts/update-version
+++ b/scripts/update-version
@@ -23,5 +23,7 @@ sed -i "s/^Version .*/Version $fv, $reldate/" iscsi-scst/README qla2x00t/qla2x00
 sed -i "s/^\(\(static const char \*scst_local_version_date\|#define[[:blank:]]*DRV_RELDATE\)[[:blank:]]*\)\"[^\"]*\"/\1\"$reldate\"/" iscsi-scst/kernel/isert-scst/isert.c scst_local/scst_local.c srpt/src/ib_srpt.c
 sed -i "s/^\(#define[[:blank:]]*[^[:blank:]]*_REV[[:blank:]]*\)\"[[:blank:]0-9]*\"/\1\"$(printf "%-4s" ${major}${minor}${release})\"/" usr/fileio/common.h scst/src/dev_handlers/scst_vdisk.c
 sed -i "s/^\(#define[[:blank:]]*SCST_VERSION_CODE[[:blank:]]*\).*/\1SCST_VERSION($major, $minor, $release, 0)/" scst/include/scst.h
-sed -i "s/^\(#define[[:blank:]]*Q2T_VERSION_CODE[[:blank:]]*\).*/\1Q2T_VERSION($major, $minor, $release, 0)/" qla2x00t/qla2x00-target/qla2x00t.h
+sed -i "s/^\(#define[[:blank:]]*Q2T_VERSION_CODE[[:blank:]]*\).*/\1Q2T_VERSION($major, $minor, $release, 0)/" \
+    qla2x00t/qla2x00-target/qla2x00t.h \
+    qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.h
 sed -i "s/^\(my .Version[[:blank:]]*=[[:blank:]]*'SCST Configurator v\)[^']*/\1$fv/" scstadmin/scstadmin.sysfs/scstadmin
diff --git a/scst/Makefile b/scst/Makefile
index 68b4d7378..959a67fa3 100644
--- a/scst/Makefile
+++ b/scst/Makefile
@@ -62,7 +62,7 @@ extraclean:
 
 release-archive:
 	../scripts/generate-release-archive scst \
-	  "$$(sed -n 's/^#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^\"]*\)\".*/\1/p' include/scst_const.h)" \
+	  "$$(sed -n 's/^#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^\"]*\)\".*/\1/p' include/scst_const.h)"
 
 build_mode:
 	$(call set_var,build_mode,BUILD_MODE,)
diff --git a/scstadmin/Makefile b/scstadmin/Makefile
index b0aa0a05f..5d962ea96 100644
--- a/scstadmin/Makefile
+++ b/scstadmin/Makefile
@@ -164,6 +164,6 @@ extraclean:
 	cd $(SCSTADMIN_DIR) && $(MAKE) $@
 
 release-archive:
-	../scripts/generate-release-archive scstadmin "$$(sed -n 's/^\$$Version[[:blank:]]*=[[:blank:]]*'"'"'SCST Configurator v\([^'"'"']*\)'"'"'.*/\1/p' scstadmin.sysfs/scstadmin)"
+	../scripts/generate-release-archive scstadmin "$$(sed -n 's/^my \$$Version[[:blank:]]*=[[:blank:]]*'"'"'SCST Configurator v\([^'"'"']*\)'"'"'.*/\1/p' scstadmin.sysfs/scstadmin)"
 
 .PHONY: all install uninstall perl-module clean distclean extraclean