diff --git a/doc/man/kxdpgun.8in b/doc/man/kxdpgun.8in
index 42387b9e1a9944938fa284c51db068d6cdef68b4..553ab933b03efe2c787a597311413cff27080896 100644
--- a/doc/man/kxdpgun.8in
+++ b/doc/man/kxdpgun.8in
@@ -51,8 +51,8 @@ configured for the network interface.
 Duration of traffic generation, specified as a decimal number in seconds
 (default is 5.0).
 .TP
-\fB\-T\fP, \fB\-\-tcp\fP[=\fIDEBUG_MODE\fP]
-Send queries over TCP. Optional debug mode see below.
+\fB\-T\fP, \fB\-\-tcp\fP[\fB=\fP\fIdebug_mode\fP]
+Send queries over TCP. See the list of optional debug modes below.
 .TP
 \fB\-Q\fP, \fB\-\-qps\fP \fIqueries\fP
 Number of queries\-per\-second (approximately) to be sent (default is 1000).
@@ -107,11 +107,7 @@ name, and \fIflags\fP is a single character:
 \fBE\fP Send query with EDNS.
 .sp
 \fBD\fP Request DNSSEC (EDNS + DO flag).
-.SS Signals
-.sp
-Sending USR1 signal to a running process triggers current statistics dump
-to the standard output.
-.SS TCP Debug Modes
+.SS TCP debug modes
 .INDENT 0.0
 .TP
 \fB1\fP
@@ -127,14 +123,18 @@ Perform TCP handshake and don\(aqt react further.
 Send incomplete query (N\-1 bytes) and don\(aqt react further.
 .TP
 \fB7\fP
-Send query and don\(aqt ACK the response or anthing further.
+Send query and don\(aqt ACK the response or anything further.
 .TP
 \fB8\fP
 Don\(aqt close the connection and ignore close by counterpart.
 .TP
 \fB9\fP
-Operate normally except of not ACKing the final FIN+ACK.
+Operate normally except for not ACKing the final FIN+ACK.
 .UNINDENT
+.SS Signals
+.sp
+Sending USR1 signal to a running process triggers current statistics dump
+to the standard output.
 .SH NOTES
 .sp
 Linux kernel 4.18+ is required.
diff --git a/doc/man_kxdpgun.rst b/doc/man_kxdpgun.rst
index e16d5df96de0d274a31859e1ab544d32aa63d0d8..30547e307206c163040bedccc8fbfb98238fc6f1 100644
--- a/doc/man_kxdpgun.rst
+++ b/doc/man_kxdpgun.rst
@@ -28,8 +28,8 @@ Options
   Duration of traffic generation, specified as a decimal number in seconds
   (default is 5.0).
 
-**-T**, **--tcp**\[\ =\ *DEBUG_MODE*\]
-  Send queries over TCP. Optional debug mode see below.
+**-T**, **--tcp**\[\ **=**\ *debug_mode*\]
+  Send queries over TCP. See the list of optional debug modes below.
 
 **-Q**, **--qps** *queries*
   Number of queries-per-second (approximately) to be sent (default is 1000).
@@ -86,13 +86,7 @@ name, and *flags* is a single character:
 
 **D** Request DNSSEC (EDNS + DO flag).
 
-Signals
-.......
-
-Sending USR1 signal to a running process triggers current statistics dump
-to the standard output.
-
-TCP Debug Modes
+TCP debug modes
 ...............
 
 **1**
@@ -108,13 +102,19 @@ TCP Debug Modes
   Send incomplete query (N-1 bytes) and don't react further.
 
 **7**
-  Send query and don't ACK the response or anthing further.
+  Send query and don't ACK the response or anything further.
 
 **8**
   Don't close the connection and ignore close by counterpart.
 
 **9**
-  Operate normally except of not ACKing the final FIN+ACK.
+  Operate normally except for not ACKing the final FIN+ACK.
+
+Signals
+.......
+
+Sending USR1 signal to a running process triggers current statistics dump
+to the standard output.
 
 Notes
 -----
diff --git a/src/utils/kxdpgun/main.c b/src/utils/kxdpgun/main.c
index 52d8e339c1c258bd68d932ac616aa0ec80675e68..8fa5caa3b6dd59fcc6bd46a5d6dbc64cd2e257e8 100644
--- a/src/utils/kxdpgun/main.c
+++ b/src/utils/kxdpgun/main.c
@@ -647,7 +647,7 @@ static void print_help(void)
 	       "Parameters:\n"
 	       " -t, --duration <sec>     "SPACE"Duration of traffic generation.\n"
 	       "                          "SPACE" (default is %"PRIu64" seconds)\n"
-	       " -T, --tcp                "SPACE"Send queries over TCP.\n"
+	       " -T, --tcp[=debug_mode]   "SPACE"Send queries over TCP.\n"
 	       " -Q, --qps <qps>          "SPACE"Number of queries-per-second (approximately) to be sent.\n"
 	       "                          "SPACE" (default is %"PRIu64" qps)\n"
 	       " -b, --batch <size>       "SPACE"Send queries in a batch of defined size.\n"