diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt
index ab5170b2f..1e7698edc 100644
--- a/src/Orchard.Profile/profiling-setup-commands.txt
+++ b/src/Orchard.Profile/profiling-setup-commands.txt
@@ -1,3 +1,3 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,PublishLater,HomePage,Contents,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,Orchard.PublishLater,HomePage,Contents,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental
 add profiling data
 feature disable Orchard.Experimental
diff --git a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
index 3ce6fc274..a06f713dc 100644
--- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
+++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
@@ -17,7 +17,7 @@ namespace Orchard.Specs.Bindings {
 
             webApp.GivenIHaveACleanSiteWith(TableData(
                 new { extension = "module", names = "Orchard.Setup, Orchard.Modules, Orchard.Packaging, Orchard.Themes, Orchard.Widgets, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce" },
-                new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, PublishLater, Routable, Scheduling, Settings, Shapes, XmlRpc" },
+                new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, Orchard.PublishLater, Routable, Scheduling, Settings, Shapes, XmlRpc" },
                 new { extension = "theme", names = "SafeMode, TheAdmin, TheThemeMachine" }));
 
             webApp.WhenIGoTo("Setup");
diff --git a/src/Orchard.Specs/Setup.feature b/src/Orchard.Specs/Setup.feature
index 64f07df9d..45d4aa23d 100644
--- a/src/Orchard.Specs/Setup.feature
+++ b/src/Orchard.Specs/Setup.feature
@@ -7,7 +7,7 @@ Scenario: Root request shows setup form
     Given I have a clean site with
             | extension | names |
             | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.jQuery, TinyMce |
-            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
+            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Orchard.PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
             | theme | SafeMode |
     When I go to "/Default.aspx"
     Then I should see "Welcome to Orchard"
@@ -18,7 +18,7 @@ Scenario: Setup folder also shows setup form
     Given I have a clean site with
             | extension | names |
             | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.jQuery, TinyMce |
-            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
+            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Orchard.PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
             | theme | SafeMode |
     When I go to "/Setup"
     Then I should see "Welcome to Orchard"
@@ -29,7 +29,7 @@ Scenario: Some of the initial form values are required
     Given I have a clean site with
             | extension | names |
             | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.jQuery, TinyMce |
-            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
+            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Orchard.PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
             | theme | SafeMode |
     When I go to "/Setup"
         And I hit "Finish Setup"
@@ -40,7 +40,7 @@ Scenario: Calling setup on a brand new install
     Given I have a clean site with
             | extension | names |
             | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce |
-            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
+            | core | Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, Orchard.PublishLater, Scheduling, Settings, Shapes, XmlRpc  |
             | theme | SafeMode, TheThemeMachine |
         And I am on "/Setup"
     When I fill in 
diff --git a/src/Orchard.Specs/Setup.feature.cs b/src/Orchard.Specs/Setup.feature.cs
index 49b0f1512..dbad29dc8 100644
--- a/src/Orchard.Specs/Setup.feature.cs
+++ b/src/Orchard.Specs/Setup.feature.cs
@@ -67,10 +67,10 @@ this.ScenarioSetup(scenarioInfo);
             table1.AddRow(new string[] {
                         "module",
                         "Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Or" +
-                            "chard.jQuery, TinyMce"});
+                            "chard.jQuery, TinyMce, Orchard.PublishLater"});
             table1.AddRow(new string[] {
                         "core",
-                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," +
+                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable," +
                             " Scheduling, Settings, Shapes, XmlRpc"});
             table1.AddRow(new string[] {
                         "theme",
@@ -103,10 +103,10 @@ this.ScenarioSetup(scenarioInfo);
             table2.AddRow(new string[] {
                         "module",
                         "Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Or" +
-                            "chard.jQuery, TinyMce"});
+                            "chard.jQuery, TinyMce, Orchard.PublishLater"});
             table2.AddRow(new string[] {
                         "core",
-                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," +
+                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable," +
                             " Scheduling, Settings, Shapes, XmlRpc"});
             table2.AddRow(new string[] {
                         "theme",
@@ -139,10 +139,10 @@ this.ScenarioSetup(scenarioInfo);
             table3.AddRow(new string[] {
                         "module",
                         "Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Or" +
-                            "chard.jQuery, TinyMce"});
+                            "chard.jQuery, TinyMce, Orchard.PublishLater"});
             table3.AddRow(new string[] {
                         "core",
-                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," +
+                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable," +
                             " Scheduling, Settings, Shapes, XmlRpc"});
             table3.AddRow(new string[] {
                         "theme",
@@ -177,10 +177,10 @@ this.ScenarioSetup(scenarioInfo);
             table4.AddRow(new string[] {
                         "module",
                         "Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Or" +
-                            "chard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce"});
+                            "chard.Modules, Orchard.Widgets, Orchard.jQuery, TinyMce, Orchard.PublishLater"});
             table4.AddRow(new string[] {
                         "core",
-                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater," +
+                        "Common, Contents, Dashboard, Feeds, HomePage, Navigation, Routable," +
                             " Scheduling, Settings, Shapes, XmlRpc"});
             table4.AddRow(new string[] {
                         "theme",
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 0081ac734..53a0ada60 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -69,7 +69,6 @@ namespace Orchard.Setup.Services {
                     "Orchard.Framework",
                     "Common",
                     "Shapes",
-                    "PublishLater",
                     "Contents",
                     "Dashboard",
                     "Reports",
@@ -89,6 +88,7 @@ namespace Orchard.Setup.Services {
                     "PackagingServices",
                     "Orchard.Modules",
                     "Orchard.Themes",
+                    "Orchard.PublishLater",
                     "Orchard.Blogs",
                     "Orchard.Comments",
                     "Orchard.Tags",