diff --git a/CHANGELOG b/CHANGELOG
index a669b9157..fb34cc395 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,10 @@ o Fixed the way Nmap detects whether one of its data files (such as
 o Update IANA assignment IP list for random IP (-iR) generation.
   Thanks to Kris Katterjohn for the patch.
 
+o Fix nmap.xsl (the transform for rendering Nmap XML results as HTML)
+  to fix some bugs related to OS detection output.  Thanks to Tom
+  Sellers for the patch.
+
 o Applied more code cleanup patches from Kris Katterjohn.
 
 o Applied some internal bugfix patches from Eddie Bell.
diff --git a/docs/nmap.xsl b/docs/nmap.xsl
index a19e6ff5e..3f873e6d9 100644
--- a/docs/nmap.xsl
+++ b/docs/nmap.xsl
@@ -372,7 +372,7 @@
     <i><xsl:value-of select="@args" /></i><br/>
     The process stopped at <xsl:value-of select="$end" />.
 	<xsl:choose>
-        <xsl:when test="debugging/@level = '0'">Debuging was disabled, </xsl:when>
+        <xsl:when test="debugging/@level = '0'">Debugging was disabled, </xsl:when>
         <xsl:otherwise>Debugging was enabled, </xsl:otherwise>
     </xsl:choose>
     the verbosity level was <xsl:value-of select="verbose/@level" />.
@@ -583,10 +583,13 @@
 <!-- os -->
 <!-- ............................................................ -->
 <xsl:template match="os">
-<xsl:if test="osmatch/@name != ''"><h3>remote operating system guess</h3></xsl:if>
-<ul>
-	<xsl:apply-templates/>
-</ul>
+	<h3>remote operating system guess</h3>
+		
+	<xsl:if test="count(osmatch) = 0"><p>Unable to identify operating system.</p></xsl:if>	
+
+	<ul>
+		<xsl:apply-templates/>
+	</ul>
 </xsl:template>
 <!-- ............................................................ -->
 
@@ -606,6 +609,22 @@
 </xsl:template>
 <!-- ............................................................ -->
 
+<!-- osfingerprint -->
+<!-- ............................................................ -->
+<xsl:template match="osfingerprint">
+	<br /><br />
+	<li>Cannot determine exact operating system.  Fingerprint provided below.</li>
+	<table cellspacing="1">
+		<tr class="head">
+    		<td>Operating System fingerprint</td>
+		</tr>
+		<tr>
+			<td><xsl:value-of select="@fingerprint" /></td>
+		</tr>
+	</table>
+</xsl:template>
+<!-- ............................................................ -->
+
 <!-- Host Script Scan -->
 <!-- ............................................................ -->
 <xsl:template match="hostscript">