Index: uportal-impl/src/main/resources/org/jasig/portal/io/import-channel-type_v2-6.crn
===================================================================
--- uportal-impl/src/main/resources/org/jasig/portal/io/import-channel-type_v2-6.crn	(revision 43907)
+++ uportal-impl/src/main/resources/org/jasig/portal/io/import-channel-type_v2-6.crn	(working copy)
@@ -1,20 +1,40 @@
-<with-attribute key="UPDATE_PORTLET_ADAPTOR" value="${groovy('${valueOf(type)}'.equals('org.jasig.portal.channels.portlet.CPortletAdapter'))}">
+<with>
+    <attribute key="UPDATE_PORTLET_ADAPTOR">${groovy('${valueOf(type)}'.equals('org.jasig.portal.channels.portlet.CPortletAdapter'))}</attribute>
+    <attribute key="UPDATE_PORTLET_CPD">${groovy('${valueOf(uri)}'.equals('/org/jasig/portal/channels/portlet/CPortletAdapter.cpd'))}</attribute>
 
-    <if test="${UPDATE_PORTLET_ADAPTOR}">
-        <!--
-         | For uP3, the Portlet Adaptor (channel) class changed
-         |   from -> org.jasig.portal.channels.portlet.CPortletAdapter
-         |   to -> org.jasig.portal.channels.portlet.CSpringPortletAdaptor
-         |
-         | We want to recognize when someone's importing a v2-6 channel-type 
-         | with the old class and update it to the new one.
-         +-->
-        <delete-node node="${singleNode(type)}"/>
-        <append-node sibling="${singleNode(name)}">
-            <type>org.jasig.portal.channels.portlet.CSpringPortletAdaptor</type>
-        </append-node>
-    </if>
+    <subtasks>
 
-    <crn location="import-channel-type_v3-0.crn"/>
+        <if test="${UPDATE_PORTLET_ADAPTOR}">
+            <!--
+             | For uP3, the Portlet Adaptor (channel) class changed
+             |   from -> org.jasig.portal.channels.portlet.CPortletAdapter
+             |   to -> org.jasig.portal.channels.portlet.CSpringPortletAdaptor
+             |
+             | We want to recognize when someone's importing a v2-6 channel-type 
+             | with the old class and update it to the new one.
+             +-->
+            <delete-node node="${singleNode(type)}"/>
+            <append-node sibling="${singleNode(name)}">
+                <type>org.jasig.portal.channels.portlet.CSpringPortletAdaptor</type>
+            </append-node>
+        </if>
 
-</with-attribute>
+        <if test="${UPDATE_PORTLET_CPD}">
+            <!--
+             | The location of the CPD also changed
+             |   from -> /org/jasig/portal/channels/portlet/CPortletAdapter.cpd
+             |   to -> /org/jasig/portal/channels/portlet/CSpringPortletAdaptor.cpd
+             |
+             | We will also detect and replace this value.
+             +-->
+            <delete-node node="${singleNode(uri)}"/>
+            <append-node>
+                <uri>/org/jasig/portal/channels/portlet/CSpringPortletAdaptor.cpd</uri>
+            </append-node>
+        </if>
+
+        <crn location="import-channel-type_v3-0.crn"/>
+        
+    </subtasks>
+
+</with>