diff --git a/service_scan.cc b/service_scan.cc
index d14aac086..604d06a08 100644
--- a/service_scan.cc
+++ b/service_scan.cc
@@ -484,6 +484,7 @@ const struct MatchDetails *ServiceProbeMatch::testMatch(const u8 *buf, int bufle
     if (*devicetype) MD_return.devicetype = devicetype;
   
     MD_return.serviceName = servicename;
+    MD_return.lineno = getLineNo();
   }
 
   return &MD_return;
diff --git a/service_scan.h b/service_scan.h
index ce6fcb360..da5a77f1d 100644
--- a/service_scan.h
+++ b/service_scan.h
@@ -124,6 +124,9 @@ struct MatchDetails {
   // The service that was matched (Or NULL) zero-terminated.
   const char *serviceName;
 
+  // The line number of this match in nmap-service-probes.
+  int lineno;
+
   // The product/verson/info for the service that was matched (Or NULL)
   // zero-terminated.
   const char *product;