diff --git a/SCAP/html-to-xccdf.xsl b/SCAP/html-to-xccdf.xsl
index 2e827a6b..b50dd686 100644
--- a/SCAP/html-to-xccdf.xsl
+++ b/SCAP/html-to-xccdf.xsl
@@ -467,29 +467,94 @@
                                 <xsl:text>ruleID=</xsl:text>
                                 <xsl:value-of select="$id"/>
                             </xsl:element>-->
-                            <!-- FIXME: imprecise selector -->
-                            <xsl:for-each select="table/tbody/tr[2]/td/div/table/tbody/tr[1]/td//li/p">
-                                <xsl:for-each select="tokenize(., ',\s+')">
-                                    <xsl:element name="reference" namespace="http://checklists.nist.gov/xccdf/1.2">
-                                        <xsl:attribute name="href">
-                                            <xsl:text>https://nvd.nist.gov/800-53/Rev5/control/</xsl:text>
-                                            <xsl:choose>
-                                                <xsl:when test="matches(., '[A-Z]{2}-\d+$')">
-                                                    <xsl:value-of select="."/>
-                                                </xsl:when>
-                                                <xsl:when test="matches(., '[A-Z]{2}-\d+\([a-z]\)$')">
-                                                    <xsl:value-of select="replace(., '\([a-z]\)$', '')"/>
-                                                </xsl:when>
-                                                <xsl:when test="matches(., '[A-Z]{2}-\d+\(\d+\).*$')">
-                                                    <xsl:value-of select="replace(., '\((\d+)\).*$', '#enhancement-$1')"/>
-                                                </xsl:when>
-                                            </xsl:choose>
-                                        </xsl:attribute>
-                                        <xsl:text>NIST SP 800-53r5 </xsl:text>
-                                        <xsl:value-of select="."/>
-                                    </xsl:element>
+
+
+                            <xsl:if test="CSRCfixesURIs">
+                                <!-- FIXME: imprecise selector -->
+                                <xsl:variable name="href-prefix" as="xs:string"
+                                    select="'https://csrc.nist.gov/Projects/risk-management/sp800-53-controls/release-search#/control?version=5.1&amp;number='"/>
+                                <xsl:for-each select="table/tbody/tr[2]/td/div/table/tbody/tr[1]/td//li/p">
+                                    <xsl:for-each select="tokenize(., ',\s+')">
+                                        <xsl:element name="reference" namespace="http://checklists.nist.gov/xccdf/1.2">
+                                            <xsl:attribute name="href">
+                                                <!-- the following generates a URI which is not a valid xs:anyURI -->
+                                                <xsl:text>https://csrc.nist.gov/Projects/risk-management/sp800-53-controls/release-search#/control?version=5.1&amp;number=</xsl:text>
+                                                <xsl:choose>
+                                                    <xsl:when test="matches(., '[A-Z]{2}-\d+$')">
+                                                        <xsl:value-of select="."/>
+                                                    </xsl:when>
+                                                    <xsl:when test="matches(., '[A-Z]{2}-\d+\([a-z]\)$')">
+                                                        <xsl:value-of select="replace(., '\([a-z]\)$', '')"/>
+                                                    </xsl:when>
+                                                    <xsl:when test="matches(., '[A-Z]{2}-\d+\(\d+\).*$')">
+                                                        <xsl:value-of select="replace(., '\((\d+)\).*$', '#enhancement-$1')"/>
+                                                    </xsl:when>
+                                                </xsl:choose>
+                                            </xsl:attribute>
+                                            <xsl:text>NIST SP 800-53r5 </xsl:text>
+                                            <xsl:value-of select="."/>
+                                        </xsl:element>
+                                    </xsl:for-each>
                                 </xsl:for-each>
+                            </xsl:if>
+
+
+                            <!-- FIXME: imprecise selectors -->
+                            <xsl:for-each select="table/tbody/tr[2]/td/div/table/tbody/tr">
+
+                                <xsl:variable name="cite" as="xs:string" select="th/p"/>
+                                <xsl:variable name="refs" as="xs:string*" select="td//li/p"/>
+
+                                <xsl:choose>
+
+                                    <xsl:when test="$refs = 'N/A'"><!-- ignore --></xsl:when>
+
+                                    <xsl:when test="$cite eq '800-53r5'">
+                                        <xsl:element name="reference" namespace="http://checklists.nist.gov/xccdf/1.2">
+                                            <xsl:attribute name="href">https://csrc.nist.gov/publications/detail/sp/800-53/rev-5/final</xsl:attribute>
+                                            <xsl:text>NIST SP 800-53r5: </xsl:text>
+                                            <xsl:value-of select="$refs"/>
+                                        </xsl:element>
+                                    </xsl:when>
+
+                                    <xsl:when test="$cite eq '800-171r2'">
+                                        <xsl:element name="reference" namespace="http://checklists.nist.gov/xccdf/1.2">
+                                            <xsl:attribute name="href">https://csrc.nist.gov/publications/detail/sp/800-171/rev-2/final</xsl:attribute>
+                                            <xsl:text>NIST SP 800-171r2: </xsl:text>
+                                            <xsl:value-of select="$refs"/>
+                                        </xsl:element>
+                                    </xsl:when>
+
+                                    <xsl:when test="$cite eq 'DISA STIG(s)'">
+                                        <xsl:element name="reference" namespace="http://checklists.nist.gov/xccdf/1.2">
+                                            <xsl:attribute name="href">https://public.cyber.mil/stigs/downloads/</xsl:attribute>
+                                            <xsl:text>DISA STIG(s): </xsl:text>
+                                            <xsl:value-of select="$refs"/>
+                                        </xsl:element>
+                                    </xsl:when>
+
+                                    <xsl:when test="$cite eq 'CIS Benchmark'">
+                                        <xsl:element name="reference" namespace="http://checklists.nist.gov/xccdf/1.2">
+                                            <xsl:attribute name="href">https://www.cisecurity.org/cis-benchmarks/</xsl:attribute>
+                                            <xsl:text>CIS Benchmark: </xsl:text>
+                                            <xsl:value-of select="$refs"/>
+                                        </xsl:element>
+                                    </xsl:when>
+
+                                    <xsl:when test="$cite eq 'CIS Controls V8'">
+                                        <xsl:element name="reference" namespace="http://checklists.nist.gov/xccdf/1.2">
+                                            <xsl:attribute name="href">https://www.cisecurity.org/controls</xsl:attribute>
+                                            <xsl:text>CIS Controls V8: </xsl:text>
+                                            <xsl:value-of select="$refs"/>
+                                        </xsl:element>
+                                    </xsl:when>
+
+                                    <xsl:otherwise><!-- do nothing --></xsl:otherwise>
+
+                                </xsl:choose>
+
                             </xsl:for-each>
+
                             <!-- FIXME: imprecise selector -->
                             <xsl:choose>
                                 <xsl:when test="descendant::tr[th/p = 'CCE']">