diff --git a/plone/app/discussion/profiles/default/metadata.xml b/plone/app/discussion/profiles/default/metadata.xml
index c5a929b..141a440 100644
--- a/plone/app/discussion/profiles/default/metadata.xml
+++ b/plone/app/discussion/profiles/default/metadata.xml
@@ -1,5 +1,5 @@
 <metadata>
- <version>1005</version>
+ <version>2000</version>
  <dependencies>
   <dependency>profile-plone.resource:default</dependency>
   <dependency>profile-plone.app.registry:default</dependency>
diff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml
index 5bd6e86..20b288e 100644
--- a/plone/app/discussion/upgrades.zcml
+++ b/plone/app/discussion/upgrades.zcml
@@ -73,26 +73,19 @@
         />
   </genericsetup:upgradeSteps>
 
-  <genericsetup:upgradeDepends
-      source="1002"
-      destination="1003"
-      profile="plone.app.discussion:default"
-      title="Update controlpanel icon"
-      import_steps="controlpanel" />
-
+  <genericsetup:upgradeSteps
+      source="1999"
+      destination="2000"
+      profile="plone.app.discussion:default">
     <genericsetup:upgradeDepends
-      source="1003"
-      destination="1004"
-      profile="plone.app.discussion:default"
-      title="Add 'View comments' permission"
-      import_steps="rolemap" />
-
-  <genericsetup:upgradeStep
-      source="1004"
-      destination="1005"
-      profile="plone.app.discussion:default"
-      title="Grant Site Administrator permissions on pending comments"
-      handler=".upgrades.upgrade_comment_workflows"
-      />
+        title="Update controlpanel icon"
+        import_steps="controlpanel" />
+    <genericsetup:upgradeDepends
+        title="Add 'View comments' permission"
+        import_steps="rolemap" />
+    <genericsetup:upgradeStep
+        title="Grant Site Administrator permissions on pending comments"
+        handler=".upgrades.upgrade_comment_workflows" />
+  </genericsetup:upgradeSteps>
 
 </configure>