diff --git a/CHANGELOG b/CHANGELOG
index c83c49a8d..c9e69fa2a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
#Nmap Changelog ($Id$); -*-text-*-
+o [Ncat][GH#2422] New Ncat option -q to delay quit after EOF on stdin, the
+ same as traditional netcat's -q option. [Daniel Miller]
+
o [NSE][GH#1014][GH#2616] SSH NSE scripts now catch connection errors thrown by
the libssh2 Lua binding, providing useful output instead of a backtrace.
[Joshua Rogers, Daniel Miller]
diff --git a/ncat/docs/ncat.xml b/ncat/docs/ncat.xml
index d20284344..c81e72bc5 100644
--- a/ncat/docs/ncat.xml
+++ b/ncat/docs/ncat.xml
@@ -726,6 +726,16 @@
+
+
+ (Delay quit after EOF on stdin)
+ (Ncat option)
+
+
+ After EOF on stdin, wait the specified amount of time, then quit. If time is negative, wait forever. Ncat may still quit based on idle timeout or EOF on the socket.
+
+
+
,
diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
index 24450ae3d..bcb680f4d 100644
--- a/ncat/ncat_main.c
+++ b/ncat/ncat_main.c
@@ -617,6 +617,7 @@ int main(int argc, char *argv[])
" --send-only Only send data, ignoring received; quit on EOF\n"
" --recv-only Only receive data, never send anything\n"
" --no-shutdown Continue half-duplex when receiving EOF on stdin\n"
+" -q