--- nmap-2.54BETA28/output.c	Sat Aug  4 21:36:12 2001
+++ nmap-2.54BETA28-XML-uptime/output.c	Mon Jul  9 07:00:26 2001
@@ -593,6 +593,7 @@
 	  log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT,"TCP/IP fingerprint:\n%s\n\n",  mergeFPs(currenths->FPs, currenths->numFPs, currenths->osscan_openport, currenths->osscan_closedport));
 	}
       } else { assert(0); }
+     log_write(LOG_XML, "</os>");
 
      if (currenths->seq.lastboot) {
        char tmbuf[128];
@@ -601,9 +602,7 @@
        strncpy(tmbuf, ctime(&(currenths->seq.lastboot)), sizeof(tmbuf));
        chomp(tmbuf);
        log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT,"Uptime %.3f days (since %s)\n", (double) (tv.tv_sec - currenths->seq.lastboot) / 86400, tmbuf);
-       log_write(LOG_XML, "<uptime lastreboot=\"%d\" uptime=\"%d\" />\n", currenths->seq.lastboot, tv.tv_sec - currenths->seq.lastboot);
      }
-     log_write(LOG_XML, "</os>");
 
      if (currenths->seq.responses > 3) {
        p=numlst;