diff --git a/doc/scst_user_spec.sgml b/doc/scst_user_spec.sgml
index eff8dc3a1..664b7b6c6 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.6.0-pre
+Version 3.6.0
diff --git a/fcst/fcst.h b/fcst/fcst.h
index 66ed933a0..64b47e985 100644
--- a/fcst/fcst.h
+++ b/fcst/fcst.h
@@ -38,7 +38,7 @@
#define NEW_LIBFC_API
#endif
-#define FT_VERSION "3.6.0-pre"
+#define FT_VERSION "3.6.0"
#define FT_MODULE "fcst"
#define FT_MAX_HW_PENDING_TIME 20 /* max I/O time in seconds */
diff --git a/iscsi-scst/README b/iscsi-scst/README
index 330743243..1b901c39a 100644
--- a/iscsi-scst/README
+++ b/iscsi-scst/README
@@ -1,7 +1,7 @@
iSCSI SCST target driver
========================
-Version 3.6.0-pre, 02 January 2021
+Version 3.6.0, 29 December 2021
----------------------------
ISCSI-SCST is a deeply reworked fork of iSCSI Enterprise Target (IET)
diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h
index abac739ea..3fe29061b 100644
--- a/iscsi-scst/include/iscsi_scst_ver.h
+++ b/iscsi-scst/include/iscsi_scst_ver.h
@@ -17,4 +17,4 @@
#define ISCSI_VERSION_STRING_SUFFIX
-#define ISCSI_VERSION_STRING "3.6.0-pre" ISCSI_VERSION_STRING_SUFFIX
+#define ISCSI_VERSION_STRING "3.6.0" ISCSI_VERSION_STRING_SUFFIX
diff --git a/iscsi-scst/kernel/isert-scst/isert.c b/iscsi-scst/kernel/isert-scst/isert.c
index 580aa32c6..016eadb57 100644
--- a/iscsi-scst/kernel/isert-scst/isert.c
+++ b/iscsi-scst/kernel/isert-scst/isert.c
@@ -515,8 +515,8 @@ out:
MODULE_AUTHOR("Yan Burman");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_IMPORT_NS(SCST);
-#define DRV_VERSION "3.6.0-pre" "#" __stringify(OFED_FLAVOR)
-#define DRV_RELDATE "02 January 2021"
+#define DRV_VERSION "3.6.0" "#" __stringify(OFED_FLAVOR)
+#define DRV_RELDATE "29 December 2021"
MODULE_DESCRIPTION("iSER target transport driver "
"v" DRV_VERSION " (" DRV_RELDATE ")");
module_init(isert_init_module);
diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README
index 0c9c7a7be..f2d27bf1f 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.6.0-pre, 02 January 2021
+Version 3.6.0, 29 December 2021
----------------------------
This is target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards.
diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h
index 3010efa03..cec7d44b1 100644
--- a/qla2x00t/qla2x00-target/qla2x00t.h
+++ b/qla2x00t/qla2x00-target/qla2x00t.h
@@ -35,7 +35,7 @@
/* Version numbers, the same as for the kernel */
#define Q2T_VERSION(a, b, c, d) (((a) << 030) + ((b) << 020) + (c) << 010 + (d))
#define Q2T_VERSION_CODE Q2T_VERSION(3, 6, 0, 0)
-#define Q2T_VERSION_STRING "3.6.0-pre"
+#define Q2T_VERSION_STRING "3.6.0"
#define Q2T_PROC_VERSION_NAME "version"
#define Q2T_MAX_CDB_LEN 16
diff --git a/scst/README b/scst/README
index 4f1626987..763c7a089 100644
--- a/scst/README
+++ b/scst/README
@@ -1,7 +1,7 @@
Generic SCSI target mid-level for Linux (SCST)
==============================================
-Version 3.6.0-pre, 02 January 2021
+Version 3.6.0, 29 December 2021
----------------------------
SCST is designed to provide unified, consistent interface between SCSI
diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h
index a604730d5..17fb19016 100644
--- a/scst/include/scst_const.h
+++ b/scst/include/scst_const.h
@@ -46,7 +46,7 @@
#define SCST_VERSION(a, b, c, d) (((a) << 24) + ((b) << 16) + ((c) << 8) + d)
#define SCST_VERSION_CODE SCST_VERSION(3, 4, 0, 0)
#define SCST_VERSION_STRING_SUFFIX
-#define SCST_VERSION_NAME "3.6.0-pre"
+#define SCST_VERSION_NAME "3.6.0"
#define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX
#define SCST_CONST_VERSION SCST_CONST_INTF_VER
diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c
index 081150be8..a204101df 100644
--- a/scst_local/scst_local.c
+++ b/scst_local/scst_local.c
@@ -89,7 +89,7 @@ static unsigned long scst_local_trace_flag = SCST_LOCAL_DEFAULT_LOG_FLAGS;
#define scsi_bufflen(cmd) ((cmd)->request_bufflen)
#endif
-#define SCST_LOCAL_VERSION "3.6.0-pre"
+#define SCST_LOCAL_VERSION "3.6.0"
static const char *scst_local_version_date = "20110901";
/* Some statistics */
diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 8915950f5..11503ab90 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -3,7 +3,7 @@
use strict;
use warnings;
-my $Version = 'SCST Configurator v3.6.0-pre';
+my $Version = 'SCST Configurator v3.6.0';
# Configures SCST
#
diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index bb4eeefec..1ef7bfc59 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.6.0-pre" "#" __stringify(OFED_FLAVOR)
-#define DRV_RELDATE "02 January 2021"
+#define DRV_VERSION "3.6.0" "#" __stringify(OFED_FLAVOR)
+#define DRV_RELDATE "29 December 2021"
#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 c449facaa..5eb4befec 100644
--- a/usr/fileio/README
+++ b/usr/fileio/README
@@ -1,7 +1,7 @@
User space FILEIO handler
=========================
-Version 3.6.0-pre, 02 January 2021
+Version 3.6.0, 29 December 2021
----------------------------
User space program fileio_tgt uses interface of SCST's scst_user dev
diff --git a/usr/include/version.h b/usr/include/version.h
index 4cd28e9a6..9c709253f 100644
--- a/usr/include/version.h
+++ b/usr/include/version.h
@@ -19,6 +19,6 @@
#ifndef __VERSION_H
#define __VERSION_H
-#define VERSION_STR "3.6.0-pre"
+#define VERSION_STR "3.6.0"
#endif /* __VERSION_H */