diff --git a/SVN_TAGS b/SVN_TAGS
index 155df1dbf..94c9b3263 100644
--- a/SVN_TAGS
+++ b/SVN_TAGS
@@ -26,4 +26,4 @@ SRPT 1.0.0 450
3.3.x branch start 7225, which is a copy of trunk r7224
3.3.0 7830 on the 3.3.x branch
3.4.x branch start 8675, which is a copy of trunk r8674
-3.4.0 8674 on the trunk
+3.4.0 8681 on the trunk
diff --git a/doc/scst_user_spec.sgml b/doc/scst_user_spec.sgml
index 75f601928..288461d68 100644
--- a/doc/scst_user_spec.sgml
+++ b/doc/scst_user_spec.sgml
@@ -10,7 +10,7 @@ SCST user space device handler interface description
Vladislav Bolkhovitin
-Version 3.2.0
+Version 3.4.0
diff --git a/iscsi-scst/README b/iscsi-scst/README
index 17d906e73..696917ebd 100644
--- a/iscsi-scst/README
+++ b/iscsi-scst/README
@@ -1,7 +1,7 @@
iSCSI SCST target driver
========================
-Version 3.4.0, 02 December 2019
+Version 3.4.0, 03 December 2019
----------------------------
ISCSI-SCST is a deeply reworked fork of iSCSI Enterprise Target (IET)
diff --git a/iscsi-scst/kernel/isert-scst/isert.c b/iscsi-scst/kernel/isert-scst/isert.c
index 3af86018f..8636fcb26 100644
--- a/iscsi-scst/kernel/isert-scst/isert.c
+++ b/iscsi-scst/kernel/isert-scst/isert.c
@@ -515,8 +515,9 @@ out:
MODULE_AUTHOR("Yan Burman");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_IMPORT_NS(SCST);
-MODULE_DESCRIPTION("iSER target transport driver v3.0.1-pre#"
- __stringify(OFED_FLAVOR));
-
+#define DRV_VERSION "3.4.0" "#" __stringify(OFED_FLAVOR)
+#define DRV_RELDATE "03 December 2019"
+MODULE_DESCRIPTION("iSER target transport driver "
+ "v" DRV_VERSION " (" DRV_RELDATE ")");
module_init(isert_init_module);
module_exit(isert_cleanup_module);
diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README
index 585c57192..69a6ffb06 100644
--- a/qla2x00t/qla2x00-target/README
+++ b/qla2x00t/qla2x00-target/README
@@ -1,7 +1,7 @@
Target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards
==============================================================
-Version 3.4.0, 02 December 2019
+Version 3.4.0, 03 December 2019
----------------------------
This is target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards.
diff --git a/scripts/update-version b/scripts/update-version
index ab2310ccc..ff57e280b 100755
--- a/scripts/update-version
+++ b/scripts/update-version
@@ -17,11 +17,11 @@ suffix=$4
fv=$major.$minor.$release$suffix
reldate=$(date "+%d %B %Y")
-sed -i "s,^\(#define[[:blank:]]*\(FT_VERSION\|ISCSI_VERSION_STRING\|Q2T_VERSION_STRING\|SCST_LOCAL_VERSION\|SCST_VERSION_NAME\|DRV_VERSION\|VERSION_STR\)[[:blank:]]*\)\"[^\"]*\",\1\"$major.$minor.$release$suffix\"," scst_local/scst_local.c srpt/src/ib_srpt.c fcst/fcst.h iscsi-scst/include/iscsi_scst_ver.h qla2x00t/qla2x00-target/qla2x00t.h scst/include/scst_const.h usr/include/version.h
+sed -i "s,^\(#define[[:blank:]]*\(FT_VERSION\|ISCSI_VERSION_STRING\|Q2T_VERSION_STRING\|SCST_LOCAL_VERSION\|SCST_VERSION_NAME\|DRV_VERSION\|VERSION_STR\)[[:blank:]]*\)\"[^\"]*\",\1\"$major.$minor.$release$suffix\"," iscsi-scst/kernel/isert-scst/isert.c scst_local/scst_local.c srpt/src/ib_srpt.c fcst/fcst.h iscsi-scst/include/iscsi_scst_ver.h qla2x00t/qla2x00-target/qla2x00t.h scst/include/scst_const.h usr/include/version.h
sed -i "s,^\(Version[[:blank:]]*\)[^[:blank:]]*\(\),\1$fv\2," doc/scst_user_spec.sgml
sed -i "s/^Version .*/Version $fv, $reldate/" iscsi-scst/README qla2x00t/qla2x00-target/README scst/README usr/fileio/README
-sed -i "s/^\(\(static const char \*scst_local_version_date\|#define[[:blank:]]*DRV_RELDATE\)[[:blank:]]*\)\"[^\"]*\"/\1\"$reldate\"/" scst_local/scst_local.c srpt/src/ib_srpt.c
+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/^\(.Version[[:blank:]]*=[[:blank:]]*'SCST Configurator v\)[0-9.]*/\1$fv/" scstadmin/scstadmin.sysfs/scstadmin
+sed -i "s/^\(my .Version[[:blank:]]*=[[:blank:]]*'SCST Configurator v\)[^']*/\1$fv/" scstadmin/scstadmin.sysfs/scstadmin
diff --git a/scst/README b/scst/README
index 4e8280b4f..1e8f2bffb 100644
--- a/scst/README
+++ b/scst/README
@@ -1,7 +1,7 @@
Generic SCSI target mid-level for Linux (SCST)
==============================================
-Version 3.4.0, 02 December 2019
+Version 3.4.0, 03 December 2019
----------------------------
SCST is designed to provide unified, consistent interface between SCSI
diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index c64f965ee..aea2e657a 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -3,7 +3,7 @@
use strict;
use warnings;
-my $Version = 'SCST Configurator v3.3.0-pre1';
+my $Version = 'SCST Configurator v3.4.0';
# Configures SCST
#
diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index 601e2cd5f..465286441 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -63,8 +63,8 @@
/* Name of this kernel module. */
#define DRV_NAME "ib_srpt"
-#define DRV_VERSION "3.4.0" __stringify(OFED_FLAVOR)
-#define DRV_RELDATE "02 December 2019"
+#define DRV_VERSION "3.4.0" "#" __stringify(OFED_FLAVOR)
+#define DRV_RELDATE "03 December 2019"
#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
/* Flags to be used in SCST debug tracing statements. */
#define DEFAULT_SRPT_TRACE_FLAGS (TRACE_OUT_OF_MEM | TRACE_MINOR \
diff --git a/usr/fileio/README b/usr/fileio/README
index b706c0ade..972f8c14a 100644
--- a/usr/fileio/README
+++ b/usr/fileio/README
@@ -1,7 +1,7 @@
User space FILEIO handler
=========================
-Version 3.4.0, 02 December 2019
+Version 3.4.0, 03 December 2019
----------------------------
User space program fileio_tgt uses interface of SCST's scst_user dev