Index: uportal-impl/src/main/resources/org/jasig/portal/io/import-channel-type_v3-0.crn
===================================================================
--- uportal-impl/src/main/resources/org/jasig/portal/io/import-channel-type_v3-0.crn	(revision 0)
+++ uportal-impl/src/main/resources/org/jasig/portal/io/import-channel-type_v3-0.crn	(revision 0)
@@ -0,0 +1,22 @@
+<groovy>
+    <!-- 
+     | We want to be sure that the specified Java class (i.e. ${valueOf(type)}) is 
+     | present in the classpath.  This implementation will yield a simple stack 
+     | trace if the test fails. 
+     +-->
+    <script>Class.forName('${valueOf(type)}');</script>
+    <subtasks>
+        <sql-transaction>
+            <with-attribute key="NEXT_ID" value="${org.jasig.portal.io.SequenceGeneratorPhrase(UP_CHAN_TYPE)}">
+                <sql-upsert>
+                    <update-statement>UPDATE up_chan_type SET type = ?, type_descr = ?, type_def_uri = ? WHERE type_name = ?</update-statement>
+                    <insert-statement>INSERT INTO up_chan_type(type, type_descr, type_def_uri, type_name, type_id) VALUES(?, ?, ?, ?, '${req(NEXT_ID)}')</insert-statement>
+                    <parameter value="${valueOf(type)}"/>
+                    <parameter value="${valueOf(desc)}"/>
+                    <parameter value="${valueOf(uri)}"/>
+                    <parameter value="${valueOf(name)}"/>
+                </sql-upsert>
+            </with-attribute>
+        </sql-transaction>
+    </subtasks>
+</groovy>
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 43854)
+++ uportal-impl/src/main/resources/org/jasig/portal/io/import-channel-type_v2-6.crn	(working copy)
@@ -1,12 +1,21 @@
-<sql-transaction>
-    <with-attribute key="NEXT_ID" value="${org.jasig.portal.io.SequenceGeneratorPhrase(UP_CHAN_TYPE)}">
-        <sql-upsert>
-            <update-statement>UPDATE up_chan_type SET type = ?, type_descr = ?, type_def_uri = ? WHERE type_name = ?</update-statement>
-            <insert-statement>INSERT INTO up_chan_type(type, type_descr, type_def_uri, type_name, type_id) VALUES(?, ?, ?, ?, '${req(NEXT_ID)}')</insert-statement>
-            <parameter value="${valueOf(type)}"/>
-            <parameter value="${valueOf(desc)}"/>
-            <parameter value="${valueOf(uri)}"/>
-            <parameter value="${valueOf(name)}"/>
-        </sql-upsert>
-    </with-attribute>
-</sql-transaction>
\ No newline at end of file
+<with-attribute key="UPDATE_PORTLET_ADAPTOR" value="${groovy('${valueOf(type)}'.equals('org.jasig.portal.channels.portlet.CPortletAdaptor'))}">
+
+    <if test="${UPDATE_PORTLET_ADAPTOR}">
+        <!--
+         | For uP3, the PortletAdaptor (channel) class changed
+         |   from -> org.jasig.portal.channels.portlet.CPortletAdaptor
+         |   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>
+
+    <crn location="import-channel-type_v3-0.crn"/>
+
+</with-attribute>
+
Index: uportal-impl/src/main/resources/org/jasig/portal/io/export-channel-type.crn
===================================================================
--- uportal-impl/src/main/resources/org/jasig/portal/io/export-channel-type.crn	(revision 43854)
+++ uportal-impl/src/main/resources/org/jasig/portal/io/export-channel-type.crn	(working copy)
@@ -1,6 +1,6 @@
 <with-attribute key="Attributes.NODE" value="${newDoc(channel-type)}">
     <echo-ln>Export Channel Type:  NAME=${req(NAME)}</echo-ln>
-    <append-node node="${attributeNode(script=classpath://org/jasig/portal/io/import-channel-type_v2-6.crn)}"/>
+    <append-node node="${attributeNode(script=classpath://org/jasig/portal/io/import-channel-type_v3-0.crn)}"/>
     <with-attribute key="TYPE_ID" value="${sql(SELECT MAX(type_id) FROM up_chan_type WHERE type_name = '${req(NAME)}')}">
         <choose>
             <when test="${isNull(${req(TYPE_ID)})}">