diff --git a/xml/cibtr-2.rng b/xml/cibtr-2.rng
index 373a0c17c8..97218c644e 100644
--- a/xml/cibtr-2.rng
+++ b/xml/cibtr-2.rng
@@ -1,18 +1,56 @@
 <!--
  Copyright 2018 Red Hat, Inc.
  Author: Jan Pokorny <jpokorny@redhat.com>
  Part of pacemaker project
  SPDX-License-Identifier: GPL-2.0-or-later
  -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
-         xmlns:cibtr="http://clusterlabs.org/ns/pacemaker/cibtr-2">
+         xmlns:cibtr="http://clusterlabs.org/ns/pacemaker/cibtr-2"
+         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="cibtr-2"/>
   </start>
 
   <define name="cibtr-2">
     <element name="cibtr:map">
-      <empty/>
+      <zeroOrMore>
+        <ref name="cibtr-2.table"/>
+      </zeroOrMore>
+    </element>
+  </define>
+
+  <define name="cibtr-2.table">
+    <element name="cibtr:table">
+      <attribute name="for">
+        <data type="string"/>
+      </attribute>
+      <attribute name="msg-prefix">
+        <data type="string"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="cibtr-2.replace"/>
+      </zeroOrMore>
+    </element>
+  </define>
+
+  <define name="cibtr-2.replace">
+    <element name="cibtr:replace">
+      <attribute name="what">
+        <data type="NCName"/>
+      </attribute>
+      <attribute name="with">
+        <choice>
+          <data type="NCName"/>
+          <empty/>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="msg-extra">
+          <data type="string">
+            <param name="minLength">1</param>
+          </data>
+        </attribute>
+      </optional>
     </element>
   </define>
 </grammar>
diff --git a/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref
new file mode 100644
index 0000000000..a4a4a23897
--- /dev/null
+++ b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref
@@ -0,0 +1,60 @@
+<!--
+ Contrieved example of how rsc_colocation/@score-attribute might have been used
+
+ This was never implemented and, apparently, will not work.
+ -->
+<cib validate-with="pacemaker-3.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config/>
+    <nodes>
+
+      <node id="virt-063" uname="virt-063">
+        <instance_attributes id="virt-063-attrs">
+          <nvpair id="virt-063-AddrHttpdTogether" name="AddrHttpdTogether" value="INFINITY"/>
+        </instance_attributes>
+      </node>
+      <node id="virt-064" uname="virt-064">
+        <instance_attributes id="virt-064-attrs">
+          <nvpair id="virt-064-AddrHttpdTogether" name="AddrHttpdTogether" value="INFINITY"/>
+        </instance_attributes>
+      </node>
+      <node id="virt-069" uname="virt-069">
+        <instance_attributes id="virt-069-attrs">
+          <!-- IPaddr2 won't work here, is DNS-load-balanced or something... -->
+          <nvpair id="virt-069-AddrHttpdTogether" name="AddrHttpdTogether" value="-INFINITY"/>
+        </instance_attributes>
+      </node>
+
+    </nodes>
+    <resources>
+
+      <primitive id="myAddr" class="ocf" provider="heartbeat" type="IPaddr2">
+        <operations>
+          <op id="myAddr-monitor" name="monitor" interval="30s"/>
+        </operations>
+        <instance_attributes id="myAddr-params">
+          <nvpair id="myAddr-ip" name="ip" value="192.0.2.10"/>
+        </instance_attributes>
+      </primitive>
+
+      <primitive id="myHttpd" class="ocf" provider="heartbeat" type="apache">
+        <operations>
+          <op id="myHttpd-monitor" name="monitor" interval="30s"/>
+        </operations>
+        <instance_attributes id="myHttpd-params">
+          <nvpair id="myHttpd-configfile" name="configfile" value="/etc/httpd/conf/httpd.conf"/>
+        </instance_attributes>
+      </primitive>
+
+    </resources>
+    <constraints>
+
+      <rsc_order id="order-addr-httpd" first="myAddr" then="myHttpd"/>
+
+      <!-- this never worked like that -->
+      <rsc_colocation id="colocation-addr-httpd" rsc="myHttpd" with-rsc="myAddr"/>
+
+    </constraints>
+  </configuration>
+  <status/>
+</cib>
diff --git a/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err
new file mode 100644
index 0000000000..95985d568f
--- /dev/null
+++ b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err
@@ -0,0 +1,2 @@
+Constraints-colocation: colocation-addr-httpd: dropping score-attribute
+Constraints-colocation: ... was actually never in effect
diff --git a/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.xml b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.xml
new file mode 100644
index 0000000000..699d3d0bd8
--- /dev/null
+++ b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.xml
@@ -0,0 +1,61 @@
+<!--
+ Contrieved example of how rsc_colocation/@score-attribute might have been used
+
+ This was never implemented and, apparently, will not work.
+ -->
+<cib validate-with="pacemaker-2.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config/>
+    <nodes>
+
+      <node id="virt-063" uname="virt-063">
+        <instance_attributes id="virt-063-attrs">
+          <nvpair id="virt-063-AddrHttpdTogether" name="AddrHttpdTogether" value="INFINITY"/>
+        </instance_attributes>
+      </node>
+      <node id="virt-064" uname="virt-064">
+        <instance_attributes id="virt-064-attrs">
+          <nvpair id="virt-064-AddrHttpdTogether" name="AddrHttpdTogether" value="INFINITY"/>
+        </instance_attributes>
+      </node>
+      <node id="virt-069" uname="virt-069">
+        <instance_attributes id="virt-069-attrs">
+          <!-- IPaddr2 won't work here, is DNS-load-balanced or something... -->
+          <nvpair id="virt-069-AddrHttpdTogether" name="AddrHttpdTogether" value="-INFINITY"/>
+        </instance_attributes>
+      </node>
+
+    </nodes>
+    <resources>
+
+      <primitive id="myAddr" class="ocf" provider="heartbeat" type="IPaddr2">
+        <operations>
+          <op id="myAddr-monitor" name="monitor" interval="30s"/>
+        </operations>
+        <instance_attributes id="myAddr-params">
+          <nvpair id="myAddr-ip" name="ip" value="192.0.2.10"/>
+        </instance_attributes>
+      </primitive>
+
+      <primitive id="myHttpd" class="ocf" provider="heartbeat" type="apache">
+        <operations>
+          <op id="myHttpd-monitor" name="monitor" interval="30s"/>
+        </operations>
+        <instance_attributes id="myHttpd-params">
+          <nvpair id="myHttpd-configfile" name="configfile" value="/etc/httpd/conf/httpd.conf"/>
+        </instance_attributes>
+      </primitive>
+
+    </resources>
+    <constraints>
+
+      <rsc_order id="order-addr-httpd" first="myAddr" then="myHttpd"/>
+
+      <!-- this never worked like that -->
+      <rsc_colocation id="colocation-addr-httpd" rsc="myHttpd" with-rsc="myAddr"
+                      score-attribute="AddrHttpdTogether"/>
+
+    </constraints>
+  </configuration>
+  <status/>
+</cib>
diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index a28f1bd28c..d1e7f4725e 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -1,39 +1,136 @@
 <!--
  Copyright 2018 Red Hat, Inc.
  Author: Jan Pokorny <jpokorny@redhat.com>
  Part of pacemaker project
  SPDX-License-Identifier: GPL-2.0-or-later
  -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:cibtr="http://clusterlabs.org/ns/pacemaker/cibtr-2">
 <xsl:output method="xml" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
 
 <xsl:param name="cib-min-ver" select="'3.0'"/>
 
 <!--
  helper definitions
  -->
 
-<cibtr:map/>
+<cibtr:map>
+
+  <!--
+   Target tag:     rsc_colocation
+   Object:         ./@*
+   -->
+  <cibtr:table for="constraints-colocation" msg-prefix="Constraints-colocation">
+    <cibtr:replace what="score-attribute"
+                   with=""
+                   msg-extra="was actually never in effect"/>
+    <cibtr:replace what="score-attribute-mangle"
+                   with=""
+                   msg-extra="was actually never in effect"/>
+  </cibtr:table>
+
+</cibtr:map>
+
+<xsl:variable name="MapConstraintsColocation"
+              select="document('')/xsl:stylesheet
+                        /cibtr:map/cibtr:table[
+                          @for = 'constraints-colocation'
+                        ]"/>
+
+<xsl:template name="MapMsg">
+  <xsl:param name="Context" select="''"/>
+  <xsl:param name="Replacement"/>
+  <xsl:choose>
+    <xsl:when test="not($Replacement)"/>
+    <xsl:when test="count($Replacement) != 1">
+      <xsl:message terminate="yes">
+        <xsl:value-of select="concat('INTERNAL ERROR:',
+                                     $Replacement/../@msg-prefix,
+                                     ': count($Replacement) != 1',
+                                     ' does not hold (',
+                                     count($Replacement), ')')"/>
+      </xsl:message>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:variable name="MsgPrefix" select="concat(
+                                               ($Replacement|$Replacement/..)
+                                                 /@msg-prefix, ': '
+                                             )"/>
+      <xsl:message>
+        <xsl:value-of select="$MsgPrefix"/>
+        <xsl:if test="$Context">
+          <xsl:value-of select="concat($Context, ': ')"/>
+        </xsl:if>
+        <xsl:choose>
+          <xsl:when test="string($Replacement/@with)">
+            <xsl:value-of select="concat('renaming ', $Replacement/@what,
+                                         ' as ', $Replacement/@with)"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="concat('dropping ', $Replacement/@what)"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:message>
+      <xsl:if test="$Replacement/@msg-extra">
+        <xsl:message>
+          <xsl:value-of select="concat($MsgPrefix, '... ',
+                                       $Replacement/@msg-extra)"/>
+        </xsl:message>
+      </xsl:if>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
 
 <!--
  actual transformation
  -->
 
 <xsl:template match="cib">
   <xsl:copy>
     <xsl:apply-templates select="@*"/>
     <xsl:attribute name="validate-with">
       <xsl:value-of select="concat('pacemaker-', $cib-min-ver)"/>
     </xsl:attribute>
     <xsl:apply-templates select="node()"/>
   </xsl:copy>
 </xsl:template>
 
+<xsl:template match="rsc_colocation">
+  <xsl:copy>
+    <xsl:for-each select="@*">
+      <xsl:variable name="Replacement"
+                    select="$MapConstraintsColocation/cibtr:replace[
+                              @what = name(current())
+                            ]"/>
+      <xsl:call-template name="MapMsg">
+        <xsl:with-param name="Context" select="../@id"/>
+        <xsl:with-param name="Replacement" select="$Replacement"/>
+      </xsl:call-template>
+      <xsl:choose>
+        <xsl:when test="$Replacement
+                        and
+                        not(string($Replacement/@with))">
+          <!-- drop -->
+        </xsl:when>
+        <xsl:when test="$Replacement">
+          <!-- rename -->
+          <xsl:attribute name="{name()}">
+            <xsl:value-of select="$Replacement/@with"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+    <xsl:apply-templates select="node()"/>
+  </xsl:copy>
+</xsl:template>
+
 <xsl:template match="@*|node()">
   <xsl:copy>
     <xsl:apply-templates select="@*|node()"/>
   </xsl:copy>
 </xsl:template>
 
 </xsl:stylesheet>