diff --git a/ChangeLog.txt b/ChangeLog.txt
index ba115c0a65..3831823ed9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+Clients:
+- Fix possible loss of data in `mosquitto_pub -l` when sending multiple long
+  lines. Closes #2078.
+
 2.0.7 - 2021-02-04
 ==================
 
diff --git a/client/pub_client.c b/client/pub_client.c
index 9153ebad25..8049de6e9f 100644
--- a/client/pub_client.c
+++ b/client/pub_client.c
@@ -275,7 +275,7 @@ int pub_stdin_line_loop(struct mosquitto *mosq)
 					break;
 				}else{
 					line_buf_len += 1024;
-					pos += 1023;
+					pos += read_len-1;
 					read_len = 1024;
 					buf2 = realloc(line_buf, (size_t )line_buf_len);
 					if(!buf2){