diff --git a/specifications/css/qtspecs.css b/specifications/css/qtspecs.css
index 979e3f611..77e6e957a 100644
--- a/specifications/css/qtspecs.css
+++ b/specifications/css/qtspecs.css
@@ -28,6 +28,8 @@ div.issue,
 div.note,
 div.notice     { margin-left: 2em; }
 
+dd div.note    { margin-left: 0; }
+
 div.issue
 p.title        { margin-left: -2em; }
 
diff --git a/specifications/xpath-functions-40/style/merge-function-specs.xsl b/specifications/xpath-functions-40/style/merge-function-specs.xsl
index 69e3f99ea..f2fa7b78e 100644
--- a/specifications/xpath-functions-40/style/merge-function-specs.xsl
+++ b/specifications/xpath-functions-40/style/merge-function-specs.xsl
@@ -178,7 +178,10 @@
 					<label>Notes</label>
 					<def>
 						<xsl:copy-of select="$fspec/fos:notes/(@diff, @at)"/>
-						<xsl:apply-templates select="$fspec/fos:notes/node()" mode="make-note"/>
+						<!--<xsl:apply-templates select="$fspec/fos:notes/node()" mode="make-note"/>-->
+						<note>
+							<xsl:apply-templates select="$fspec/fos:notes/node()"/>
+						</note>
 					</def>
 				</gitem>
 			</xsl:if>
diff --git a/style/xmlspec-2016.xsl b/style/xmlspec-2016.xsl
index 7b720b2a2..3e97c6894 100644
--- a/style/xmlspec-2016.xsl
+++ b/style/xmlspec-2016.xsl
@@ -1360,6 +1360,13 @@
       <xsl:apply-templates/>
     </div>
   </xsl:template>
+  
+  <xsl:template match="gitem[label='Notes']/def/note">
+    <!--Avoid the extra "Note" label in the Notes section of the F&O spec -->
+    <div class="note">
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
 
   <!-- notice: a front-matter advisory about the spec's status -->
   <!-- make sure people notice it -->