diff --git a/news/+ajax_marker.internal.rst b/news/+ajax_marker.internal.rst
new file mode 100644
index 00000000..fe1171a5
--- /dev/null
+++ b/news/+ajax_marker.internal.rst
@@ -0,0 +1 @@
+Add 6.2 upgrade for the IClassicUISchema control panel and the use_ajax_main_template registry entry.
diff --git a/src/plone/app/upgrade/v62/configure.zcml b/src/plone/app/upgrade/v62/configure.zcml
index 0cbd8d55..368c739c 100644
--- a/src/plone/app/upgrade/v62/configure.zcml
+++ b/src/plone/app/upgrade/v62/configure.zcml
@@ -4,6 +4,8 @@
     i18n_domain="plone"
     >
 
+  <include file="profiles.zcml" />
+
   <gs:upgradeSteps
       profile="Products.CMFPlone:plone"
       source="6199"
@@ -15,6 +17,10 @@
         handler="..v61.final.make_external_editor_action_condition_safer"
         />
 
+    <gs:upgradeDepends
+        title="Register IClassicUISchema control panel."
+        import_profile="plone.app.upgrade.v62:to_iclassicuischema"
+        />
   </gs:upgradeSteps>
 
 </configure>
diff --git a/src/plone/app/upgrade/v62/profiles.zcml b/src/plone/app/upgrade/v62/profiles.zcml
new file mode 100644
index 00000000..c861d5d5
--- /dev/null
+++ b/src/plone/app/upgrade/v62/profiles.zcml
@@ -0,0 +1,15 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    i18n_domain="plone"
+    >
+
+  <genericsetup:registerProfile
+      name="to_iclassicuischema"
+      title="Reregister IClassicUISchema for new records"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
+      directory="profiles/to_iclassicuischema"
+      />
+
+</configure>
diff --git a/src/plone/app/upgrade/v62/profiles/to_iclassicuischema/registry.xml b/src/plone/app/upgrade/v62/profiles/to_iclassicuischema/registry.xml
new file mode 100644
index 00000000..c3256da7
--- /dev/null
+++ b/src/plone/app/upgrade/v62/profiles/to_iclassicuischema/registry.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+  <records interface="plone.base.interfaces.IClassicUISchema"
+           prefix="plone"
+  />
+</registry>