diff --git a/scst/ChangeLog b/scst/ChangeLog
index 5bb1c4ad3..8d24f9a1a 100644
--- a/scst/ChangeLog
+++ b/scst/ChangeLog
@@ -20,6 +20,8 @@ Summary of changes between versions 2.0.0 and 2.1.0
    to prevent possible starvation under heavy load and in some cases
    improve performance
 
+ - Autogenerated SCST target names made deprecated
+
  - Custom parse improvements
 
  - Logging improvements
diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c
index d4cf5a99f..c0f9121a3 100644
--- a/scst/src/scst_main.c
+++ b/scst/src/scst_main.c
@@ -506,6 +506,12 @@ struct scst_tgt *scst_register_target(struct scst_tgt_template *vtt,
 	} else {
 		static int tgt_num; /* protected by scst_mutex */
 
+		PRINT_WARNING("Usage of autogenerated SCST target names "
+			"is deprecated and will be removed in one of the next "
+			"versions. It is strongly recommended to update target "
+			"driver %s to use hardware related persistent target "
+			"names instead", vtt->name);
+
 		tgt->tgt_name = kasprintf(GFP_KERNEL, "%s%s%d", vtt->name,
 			SCST_DEFAULT_TGT_NAME_SUFFIX, tgt_num);
 		if (tgt->tgt_name == NULL) {