diff --git a/CHANGELOG b/CHANGELOG
index 030a72627..6c84e04a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o XML output now contains the full path to nmap.xml on Windows. [Jah]
+
 o Zenmap no longer outputs XML elements and attributes that are not in
   the Nmap XML DTD. This was done mostly by removing things from
   Zenmap's output, and adding a few new optional things to the Nmap
diff --git a/NmapOps.cc b/NmapOps.cc
index 15f29dbd1..dd36481a2 100644
--- a/NmapOps.cc
+++ b/NmapOps.cc
@@ -247,11 +247,13 @@ void NmapOps::Initialize() {
   reason = false;
   if (datadir) free(datadir);
   datadir = NULL;
+  if (nmap_fetchfile(tmpxsl, sizeof(tmpxsl), "nmap.xsl") != 1) {
 #if WIN32
   Strncpy(tmpxsl, "nmap.xsl", sizeof(tmpxsl));
 #else
   Snprintf(tmpxsl, sizeof(tmpxsl), "%s/nmap.xsl", NMAPDATADIR);
 #endif
+  }
   if (xsl_stylesheet) free(xsl_stylesheet);
   xsl_stylesheet = strdup(tmpxsl);
   spoof_mac_set = false;