diff --git a/ChangeLog.txt b/ChangeLog.txt
index c03ad2bc..c3e05be7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,6 +8,10 @@ Broker:
 - Fix error message when websockets http_dir directory does not exist.
 - Improve password utility error message. Closes #379.
 
+Clients:
+- Use of --ciphers no longer requires you to also pass --tls-version.
+  Closes #380.
+
 Client library:
 - Clients can now use TLS with IPv6.
 - Fix potential socket leakage when reconnecting. Closes #304.
diff --git a/client/client_shared.c b/client/client_shared.c
index cecc5ab5..b82d6c24 100644
--- a/client/client_shared.c
+++ b/client/client_shared.c
@@ -690,7 +690,7 @@ int client_opts_set(struct mosquitto *mosq, struct mosq_config *cfg)
 		return 1;
 	}
 #  endif
-	if(cfg->tls_version && mosquitto_tls_opts_set(mosq, 1, cfg->tls_version, cfg->ciphers)){
+	if((cfg->tls_version || cfg->ciphers) && mosquitto_tls_opts_set(mosq, 1, cfg->tls_version, cfg->ciphers)){
 		if(!cfg->quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
 		mosquitto_lib_cleanup();
 		return 1;