diff --git a/mesh/config-client.c b/mesh/config-client.c
index a6cd87e..95297bf 100644
--- a/mesh/config-client.c
+++ b/mesh/config-client.c
@@ -1053,7 +1053,7 @@
 	n = mesh_opcode_set(OP_CONFIG_HEARTBEAT_PUB_SET, msg);
 
 	parm_cnt = read_input_parameters(argc, argv);
-	if (parm_cnt != 5) {
+	if (parm_cnt != 6) {
 		bt_shell_printf("Bad arguments: %s\n", argv[1]);
 		return bt_shell_noninteractive_quit(EXIT_FAILURE);
 	}
@@ -1067,12 +1067,12 @@
 	/* Period Log */
 	msg[n++] = parms[2];
 	/* Heartbeat TTL */
-	msg[n++] = DEFAULT_TTL;
+	msg[n++] = parms[3];
 	/* Features */
-	put_le16(parms[3], msg + n);
+	put_le16(parms[4], msg + n);
 	n += 2;
 	/* NetKey Index */
-	put_le16(parms[4], msg + n);
+	put_le16(parms[5], msg + n);
 	n += 2;
 
 	if (!config_send(msg, n)) {
@@ -1183,8 +1183,8 @@
 						"Set relay"},
 	{"relay-get",           NULL,                   cmd_relay_get,
 						"Get relay"},
-	{"hb-pub-set", "<pub_addr> <count> <period> <features> <net_idx>",
-				cmd_hb_pub_set,     "Set heartbeat publish"},
+	{"hb-pub-set", "<pub_addr> <count> <period> <ttl> <features> <net_idx>",
+				cmd_hb_pub_set,	"Set heartbeat publish"},
 	{"hb-pub-get",           NULL,                   cmd_hb_pub_get,
 						"Get heartbeat publish"},
 	{"hb-sub-set", "<src_addr> <dst_addr> <period>",