diff --git a/nmap.h b/nmap.h
index 3f5257a1b..0d4d53fbd 100644
--- a/nmap.h
+++ b/nmap.h
@@ -288,6 +288,9 @@ void *realloc();
 
 #define MAXFALLBACKS 20 /* How many comma separated fallbacks are allowed in the service-probes file? */
 
+/* The trace level to give to nsp_settrace with --packet-trace et al. */
+#define NSOCK_TRACE_LEVEL 2
+
 /* Default maximum send delay between probes to the same host */
 #ifndef MAX_TCP_SCAN_DELAY
 #define MAX_TCP_SCAN_DELAY 1000
diff --git a/nmap_dns.cc b/nmap_dns.cc
index 7ca7d6d50..b6f447222 100644
--- a/nmap_dns.cc
+++ b/nmap_dns.cc
@@ -1193,7 +1193,7 @@ static void nmap_mass_rdns_core(Target **targets, int num_targets) {
     fatal("Unable to create nsock pool in %s()", __func__);
 
   if ((lasttrace = o.packetTrace()))
-    nsp_settrace(dnspool, 5, o.getStartTime());
+    nsp_settrace(dnspool, NSOCK_TRACE_LEVEL, o.getStartTime());
   
   connect_dns_servers();
 
@@ -1215,7 +1215,7 @@ static void nmap_mass_rdns_core(Target **targets, int num_targets) {
     if (o.packetTrace() != lasttrace) {
       lasttrace = !lasttrace;
       if (lasttrace)
-	nsp_settrace(dnspool, 5, o.getStartTime());
+	nsp_settrace(dnspool, NSOCK_TRACE_LEVEL, o.getStartTime());
       else nsp_settrace(dnspool, 0, o.getStartTime());
     }
     nsock_loop(dnspool, timeout);
diff --git a/nse_nsock.cc b/nse_nsock.cc
index 8fd53954c..9eb34283d 100644
--- a/nse_nsock.cc
+++ b/nse_nsock.cc
@@ -379,9 +379,8 @@ int luaopen_nsock (lua_State *L)
   luaL_newmetatable(L, "nsock_proxy");
 
   nsp = nsp_new(NULL);
-  //nsp_settrace(nsp, o.debugging, o.getStartTime());
   if (o.scriptTrace())
-    nsp_settrace(nsp, 5, o.getStartTime());
+    nsp_settrace(nsp, NSOCK_TRACE_LEVEL, o.getStartTime());
 
   return 0;
 }
diff --git a/service_scan.cc b/service_scan.cc
index e0eff313f..7f69f77f3 100644
--- a/service_scan.cc
+++ b/service_scan.cc
@@ -2422,7 +2422,7 @@ int service_scan(vector<Target *> &Targets) {
   }
 
   if (o.versionTrace()) {
-    nsp_settrace(nsp, 5, o.getStartTime());
+    nsp_settrace(nsp, NSOCK_TRACE_LEVEL, o.getStartTime());
   }
 
   launchSomeServiceProbes(nsp, SG);