diff --git a/CHANGELOG b/CHANGELOG
index edf869f4b..4dc5b9f9a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Ncat] --output logging now works in UDP mode. Thanks to Michal
+  Hlavinka for reporting the bug. [David Fifield]
+
 o [NSE] Added pcanywhere-brute script which bruteforces pcAnywhere server
   for valid logins. [Aleksandar Nikolic]
 
diff --git a/ncat/ncat_listen.c b/ncat/ncat_listen.c
index fcb0a5622..85354115a 100644
--- a/ncat/ncat_listen.c
+++ b/ncat/ncat_listen.c
@@ -673,7 +673,8 @@ static int ncat_listen_dgram(int proto)
             }
 
             /* Dump the current datagram */
-            Recv(socket_n, buf, sizeof(buf), 0);
+            nbytes = Recv(socket_n, buf, sizeof(buf), 0);
+            ncat_log_recv(buf, nbytes);
         }
 
         if (o.debug > 1)
@@ -732,6 +733,7 @@ static int ncat_listen_dgram(int proto)
                         send(socket_n, tempbuf, nbytes, 0);
                     else
                         send(socket_n, buf, nbytes, 0);
+                    ncat_log_send(buf, nbytes);
                 }
                 if (tempbuf != NULL) {
                     free(tempbuf);
@@ -745,6 +747,7 @@ static int ncat_listen_dgram(int proto)
                     close(socket_n);
                     return 1;
                 }
+                ncat_log_recv(buf, nbytes);
                 if (!o.sendonly)
                     Write(STDOUT_FILENO, buf, nbytes);
             }