diff --git a/CHANGELOG b/CHANGELOG
index 4fc03d6f8..7be2ed5f0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed a regression that changed the number of delimiters in machine
+  output. [Daniel Miller]
+
 o [Zenmap] Updated the Italian translation. [Giacomo]
 
 o Handle ICMP type 11 (Time Exceeded) responses to port scan probes.
diff --git a/output.cc b/output.cc
index 37a4ccc3d..57930d21f 100644
--- a/output.cc
+++ b/output.cc
@@ -760,7 +760,7 @@ void printportoutput(Target *currenths, PortList *plist) {
             p++;
           }
         }
-        log_write(LOG_MACHINE, "%d/%s/%s//%s/%s/", current->portno,
+        log_write(LOG_MACHINE, "%d/%s/%s//%s//%s/", current->portno,
                   state, protocol, serviceinfo, grepvers);
 
         xml_open_start_tag("port");