diff --git a/build/statistics.xsl b/build/statistics.xsl
index b246a840..fe3b1f1d 100644
--- a/build/statistics.xsl
+++ b/build/statistics.xsl
@@ -571,12 +571,14 @@
                     Classify Shibboleth 2.0 IdPs and SPs.
                 -->
                 <xsl:variable name="entities.shib.2.in" select="$entities.openathenssp.out"/>
-                <xsl:variable name="idps.shib.2"
-                    select="$entities.shib.2.in/descendant::md:SingleSignOnService[contains(@Location, '/profile/Shibboleth/SSO')]/ancestor::md:EntityDescriptor"/>
-                <xsl:variable name="sps.shib.2"
-                    select="$entities.shib.2.in/descendant::md:AssertionConsumerService[contains(@Location, '/Shibboleth.sso/SAML2/POST')]/ancestor::md:EntityDescriptor"/>
                 <xsl:variable name="entities.shib.2"
-                    select="$idps.shib.2 | $sps.shib.2"/>
+                    select="$entities.shib.2.in[
+                        md:IDPSSODescriptor/md:SingleSignOnService[contains(@Location, '/profile/Shibboleth/SSO')] |
+                        md:SPSSODescriptor/md:AssertionConsumerService[contains(@Location, '/Shibboleth.sso/SAML2/POST')] |
+                        md:Extensions/uklabel:Software[@name='Shibboleth'][@version = '2']
+                    ]"/>
+                <xsl:variable name="idps.shib.2" select="$entities.shib.2[md:IDPSSODescriptor]"/>
+                <xsl:variable name="sps.shib.2" select="$entities.shib.2[md:SPSSODescriptor]"/>
                 <xsl:variable name="entities.shib.2.out"
                     select="set:difference($entities.shib.2.in, $entities.shib.2)"/>
 
@@ -704,18 +706,18 @@
                     ***************************************************************
                 -->
                 
-                <h3>Shibboleth 2.0</h3>
+                <h3>Shibboleth 2</h3>
                 <p>
                     There are <xsl:value-of select="count($entities.shib.2)"/> entities in the metadata
-                    that look like they are probably running Shibboleth 2.0.
+                    running Shibboleth 2.
                     This is <xsl:value-of select="format-number(count($entities.shib.2) div $entityCount, '0.0%')"/>
                     of all entities.
                 </p>
                 
-                <h4>Shibboleth 2.0 Identity Providers</h4>
+                <h4>Shibboleth 2 Identity Providers</h4>
                 <p>
-                    The following <xsl:value-of select="count($idps.shib.2)"/> identity providers look like they are
-                    running Shibboleth 2.0.
+                    The following <xsl:value-of select="count($idps.shib.2)"/> identity providers are
+                    running Shibboleth 2.
                     This is <xsl:value-of select="format-number(count($idps.shib.2) div $idpCount, '0.0%')"/>
                     of all identity providers.</p>
                 <ul>
@@ -728,23 +730,12 @@
                     </xsl:for-each>
                 </ul>
                 
-                <h4>Shibboleth 2.0 Service Providers</h4>
-                <xsl:if test="count($sps.shib.2) = 1">
-                    <p>
-                        The following service provider looks like it is
-                        running Shibboleth 2.0.
-                        This is <xsl:value-of select="format-number(count($sps.shib.2) div $spCount, '0.0%')"/>
-                        of all service providers.
-                    </p>
-                </xsl:if>
-                <xsl:if test="count($sps.shib.2) != 1">
-                    <p>
-                        The following <xsl:value-of select="count($sps.shib.2)"/> service providers look like they are
-                        running Shibboleth 2.0.
-                        This is <xsl:value-of select="format-number(count($sps.shib.2) div $spCount, '0.0%')"/>
-                        of all service providers.
-                    </p>
-                </xsl:if>
+                <h4>Shibboleth 2 Service Providers</h4>
+                <p>
+                    The following service providers are running Shibboleth 2.
+                    This is <xsl:value-of select="format-number(count($sps.shib.2) div $spCount, '0.0%')"/>
+                    of all service providers.
+                </p>
                 <ul>
                     <xsl:for-each select="$sps.shib.2">
                         <li>