diff --git a/iscsi-scst/usr/target.c b/iscsi-scst/usr/target.c
index 9c6898d98..0cb47fe31 100644
--- a/iscsi-scst/usr/target.c
+++ b/iscsi-scst/usr/target.c
@@ -415,7 +415,8 @@ int target_create(const char *name, struct target **out_target)
 	}
 
 	memset(target, 0, sizeof(*target));
-	memcpy(target->name, name, sizeof(target->name) - 1);
+	strncpy(target->name, name, sizeof(target->name) - 1);
+	target->name[sizeof(target->name)-1] = '\0';
 
 	params_set_defaults(target->target_params, target_keys);
 	params_set_defaults(target->session_params, session_keys);