diff --git a/CHANGELOG b/CHANGELOG
index ec4f9d5ba..093acbaf8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Made a few improvements to nmap.xsl (details:
+  http://seclists.org/nmap-dev/2009/q1/0210.html) [Tom Sellers]
+
 o A new Zenmap translation: French, contributed by Gutek
 
 o The xampp-default-auth.nse script was renamed to ftp-brute.nse.
diff --git a/docs/nmap.xsl b/docs/nmap.xsl
index df72bbe0b..8a2aa1ce8 100644
--- a/docs/nmap.xsl
+++ b/docs/nmap.xsl
@@ -653,16 +653,28 @@
 <!-- osfingerprint -->
 <!-- ............................................................ -->
 <xsl:template match="osfingerprint">
-	<br /><br />
-	<li>Cannot determine exact operating system.  Fingerprint provided below.</li>
+       <xsl:choose>
+               <xsl:when test="count(../osmatch)=0">
+                       <br /><br />
+                       <li>Cannot determine exact operating system.  Fingerprint provided below.</li>
+                       <li>If you know what OS is running on it, see http://nmap.org/submit/</li>
+               </xsl:when>
+               <xsl:otherwise>
+                       <br /><br />
+                       <li>OS Fingerprint requested at scan time and provided below.</li>
+               </xsl:otherwise>
+       </xsl:choose>
+
+
 	<table cellspacing="1">
 		<tr class="head">
     		<td>Operating System fingerprint</td>
 		</tr>
 		<tr>
-			<td><xsl:value-of select="@fingerprint" /></td>
+                       <td><pre><xsl:value-of select="@fingerprint" /></pre></td>
 		</tr>
 	</table>
+
 </xsl:template>
 <!-- ............................................................ -->