diff --git a/specifications/xpath-datamodel-40/style/data-model.xsl b/specifications/xpath-datamodel-40/style/data-model.xsl
index cda65d624..05160f33c 100644
--- a/specifications/xpath-datamodel-40/style/data-model.xsl
+++ b/specifications/xpath-datamodel-40/style/data-model.xsl
@@ -200,7 +200,7 @@
   </xsl:template>
 -->
 
-<xsl:template match="processing-instruction('glossary')">
+<!--<xsl:template match="processing-instruction('glossary')">
   <table class="glossarytab">
     <xsl:for-each select="//termdef[not(ancestor-or-self::*[@diff][1][@diff='del'])]">
       <xsl:sort select="@term"/>
@@ -214,7 +214,7 @@
       </tr>
     </xsl:for-each>
   </table>
-</xsl:template>
+</xsl:template>-->
 
   <!-- changed templates to auto generate an appendix with a list
        of links to open issues. -->
diff --git a/specifications/xpath-functions-40/src/xpath-functions.xml b/specifications/xpath-functions-40/src/xpath-functions.xml
index fd26b482c..738ff3bf5 100644
--- a/specifications/xpath-functions-40/src/xpath-functions.xml
+++ b/specifications/xpath-functions-40/src/xpath-functions.xml
@@ -11571,6 +11571,11 @@ ISBN 0 521 77752 6.</bibl>
             <?doc schema-for-csv.xsd?>
          </div2>
       </div1>
+      
+      <inform-div1 id="glossary">
+         <head>Glossary</head>
+         <?glossary?>
+      </inform-div1>
 
       <inform-div1 id="other-functions">
          <head>Other Functions</head>
diff --git a/specifications/xslt-40/style/xslt.xsl b/specifications/xslt-40/style/xslt.xsl
index bfd722d6f..7018e93f6 100644
--- a/specifications/xslt-40/style/xslt.xsl
+++ b/specifications/xslt-40/style/xslt.xsl
@@ -477,7 +477,7 @@ constructor. These elements are:</p>
     </pre>
   </xsl:template>
 
-<xsl:template match="processing-instruction('glossary')">
+<!--<xsl:template match="processing-instruction('glossary')">
     <dl>
     <xsl:for-each select="//termdef[not(ancestor-or-self::*[@diff][1][@diff='del'])]">
       <xsl:sort select="lower-case(@term)"/>
@@ -495,18 +495,7 @@ constructor. These elements are:</p>
       </dd>
     </xsl:for-each>
     </dl>
-<!--
-  <table width="100%" cellspacing="10">
-      <xsl:for-each select="//termdef[not(ancestor-or-self::*[@diff][1][@diff='del'])]">
-      <xsl:sort select="@term"/>
-      <tr>
-      <td width="20%" valign="top"><a href="#{@id}"><xsl:value-of select="@term"/></a></td>
-      <td valign="top"><p><xsl:apply-templates/></p></td>
-      </tr>
-    </xsl:for-each>
-  </table>
--->
-</xsl:template>
+</xsl:template>-->
   
   
   <xsl:template match="processing-instruction('xslt-defined-functions')">
diff --git a/style/xsl-query-2016.xsl b/style/xsl-query-2016.xsl
index 543534d35..99bcce0f9 100644
--- a/style/xsl-query-2016.xsl
+++ b/style/xsl-query-2016.xsl
@@ -473,13 +473,25 @@
 
   <xsl:template match="processing-instruction('glossary')">
     <dl>
-      <xsl:apply-templates select="//termdef" mode="glossary-list">
+      <xsl:for-each select="//termdef[not(ancestor-or-self::*[@diff][1][@diff='del'])]">
         <xsl:sort select="@term" data-type="text" order="ascending" lang="en"/>
-      </xsl:apply-templates>
+        <dt>
+          <a href="#{@id}"><xsl:value-of select="@term"/></a>
+        </dt>
+        <dd>
+          <p>
+            <xsl:apply-templates/>
+          </p>
+          <xsl:if test="@open='true'">
+            <xsl:variable name="close" select="../following-sibling::p[@role='closetermdef'][1]"/>
+            <xsl:apply-templates select="../following-sibling::*[$close >> .]"/>
+          </xsl:if>
+        </dd>
+      </xsl:for-each>
     </dl>
   </xsl:template>
 
-  <xsl:template match="termdef" mode="glossary-list">
+  <!--<xsl:template match="termdef" mode="glossary-list">
     <xsl:variable name="diff_governor" select="ancestor-or-self::*[@diff][1]"/>
     <xsl:variable name="diff_effect" select="my:diff-markup-effect($diff_governor)"/>
     <xsl:choose>
@@ -518,7 +530,7 @@
       </xsl:when>
 
     </xsl:choose>
-  </xsl:template>
+  </xsl:template>-->
 
   <!-- ====================================================================== -->
   <!-- Automatic lists of impl def/dep features -->
