diff --git a/CHANGELOG b/CHANGELOG
index a3daa03a1..fe5ba3301 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o If a host times out, the XML <host> element will have the attribute
+  timedout="true" and the host's timing info (srtt etc.) will still be printed.
+
 o [GH#2269] Fix an issue with -sU where payload data went out-of-scope before
   it was used, causing corrupted payloads to be sent. [Mariusz Ziulek]
 
diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index ba091be2e..002625090 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -47,6 +47,7 @@
 <!ENTITY % attr_ipaddr "CDATA" >
 <!ENTITY % attr_percent "CDATA" >
 <!ENTITY % attr_type "(ipv4 | ipv6 | mac)" >
+<!ENTITY % attr_bool "(true | false)" >
 
 <!ENTITY % host_states "(up|down|unknown|skipped)" >
 
@@ -147,6 +148,7 @@
 <!ATTLIST host
 			starttime	%attr_numeric;	#IMPLIED
 			endtime		%attr_numeric;	#IMPLIED
+			timedout	%attr_bool;	#IMPLIED
 			comment		CDATA		#IMPLIED
 >
 
diff --git a/nmap.cc b/nmap.cc
index 037803261..f0354cf95 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -2228,8 +2228,10 @@ int nmap_main(int argc, char *argv[]) {
         xml_open_start_tag("host");
         xml_attribute("starttime", "%lu", (unsigned long) currenths->StartTime());
         xml_attribute("endtime", "%lu", (unsigned long) currenths->EndTime());
+        xml_attribute("timedout", "true");
         xml_close_start_tag();
         write_host_header(currenths);
+        printtimes(currenths);
         xml_end_tag(); /* host */
         xml_newline();
         log_write(LOG_PLAIN, "Skipping host %s due to host timeout\n",