diff --git a/xml/xslt/numbering.xslt b/xml/xslt/numbering.xslt
index ed0974b..12232bd 100644
--- a/xml/xslt/numbering.xslt
+++ b/xml/xslt/numbering.xslt
@@ -7,23 +7,34 @@
     <xsl:template match="finding" mode="number">
         <!-- Output finding display number (context is finding) -->
         <xsl:variable name="sectionNumber">
-            <xsl:choose>
-                <xsl:when test="/pentest_report/@findingNumberingBase = 'Section'">
+            <xsl:if test="/pentest_report/@findingNumberingBase = 'Section'">
                     <xsl:value-of
                         select="count(ancestor::section[last()]/preceding-sibling::section) + 1"/>
-                </xsl:when>
-                <xsl:otherwise>0</xsl:otherwise>
-            </xsl:choose>
+                </xsl:if>
         </xsl:variable>
         <xsl:variable name="findingNumber" select="count(preceding::finding) + 1"/>
-        <xsl:variable name="numFormat" select="'00'"/>
+        <xsl:variable name="numFormat">
+            <xsl:choose>
+                <xsl:when test="/pentest_report/@findingNumberingBase = 'Section'">00</xsl:when>
+                <xsl:otherwise>000</xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
         <xsl:value-of
             select="concat(ancestor::*[@findingCode][1]/@findingCode, '-', $sectionNumber, string(format-number($findingNumber, $numFormat)))"
         />
     </xsl:template>
+    
+    <xsl:template match="non-finding" mode="number">
+        <!-- Output finding display number (context is finding) -->
+        <xsl:variable name="nonFindingNumber" select="count(preceding::non-finding) + 1"/>
+        <xsl:variable name="numFormat" select="'000'"/>
+        <xsl:value-of
+            select="concat('NF-', string(format-number($nonFindingNumber, $numFormat)))"
+        />
+    </xsl:template>
 
     <xsl:template
-        match="section[not(@visibility = 'hidden')] | appendix[not(@visibility = 'hidden')] | non-finding"
+        match="section[not(@visibility = 'hidden')] | appendix[not(@visibility = 'hidden')]"
         mode="number">
         <xsl:choose>
             <xsl:when test="$EXEC_SUMMARY = true()">
@@ -82,5 +93,20 @@
             <xsl:number count="biblioentry" format="{$AUTO_NUMBERING_FORMAT}"/>
         </fo:inline>
     </xsl:template>
+    
+    <xsl:template name="prependNumber">
+        <xsl:choose>
+                <xsl:when test="parent::finding">
+                    <!-- prepend finding id (XXX-NNN) -->
+                    <xsl:apply-templates select=".." mode="number"/>
+                    <xsl:text> &#8212; </xsl:text>
+                </xsl:when>
+                <xsl:when test="parent::non-finding">
+                    <!-- prepend non-finding id (NF-NNN) -->
+                    <xsl:apply-templates select=".." mode="number"/>
+                    <xsl:text> &#8212; </xsl:text>
+                </xsl:when>
+            </xsl:choose>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/xml/xslt/structure.xslt b/xml/xslt/structure.xslt
index 5f38d90..c945dc1 100644
--- a/xml/xslt/structure.xslt
+++ b/xml/xslt/structure.xslt
@@ -93,11 +93,7 @@
                 </xsl:otherwise>
             </xsl:choose>
             <xsl:text>&#160;&#160;&#160;</xsl:text>
-            <xsl:if test="parent::finding">
-                <!-- prepend finding id (XXX-NNN) -->
-                <xsl:apply-templates select=".." mode="number"/>
-                <xsl:text> &#8212; </xsl:text>
-            </xsl:if>
+            <xsl:call-template name="prependNumber"/>
             <xsl:apply-templates/>
         </fo:block>
         <xsl:if test="parent::finding">
diff --git a/xml/xslt/toc.xslt b/xml/xslt/toc.xslt
index cc8978a..6ca7c0c 100644
--- a/xml/xslt/toc.xslt
+++ b/xml/xslt/toc.xslt
@@ -90,12 +90,7 @@
     </xsl:template>
 
     <xsl:template match="title" mode="toc">
-        <xsl:if test="parent::finding">
-            <!-- prepend finding id (XXX-NNN) -->
-            <xsl:apply-templates select=".." mode="number"/>
-            <xsl:text> &#8212; </xsl:text>
-        </xsl:if>
-        <!--<xsl:apply-templates select="text()|*/text()"/>-->
+        <xsl:call-template name="prependNumber"/>
         <xsl:apply-templates/>
     </xsl:template>