diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
index 571460db2..089f68338 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
@@ -9,8 +9,11 @@
     <Version>1.0</Version>
   </Recipe>
 
-  <Feature disable="Orchard.Media" enable="Orchard.Experimental" />
-  
+  <Feature enable="Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,
+           Orchard.jQuery,Orchard.Lists,Orchard.Media,
+           Orchard.Tags,Orchard.Scripting,Orchard.Scripting.Lightweight,
+           TinyMce,PackagingServices,Orchard.Packaging,Gallery,TheThemeMachine,Orchard.Experimental" />
+
   <Metadata>
       <Types>
         <Page ContentTypeSettings.Draftable="True" TypeIndexing.Included="true">
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 54d8b25ec..42c171457 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -93,34 +93,14 @@ namespace Orchard.Setup.Services {
                     "Scheduling",
                     "Settings",
                     "Shapes",
-
-                    // Other
-                    "Orchard.PublishLater", // todo: (sebros) remove
-                    "Orchard.Blogs",
-                    "Orchard.Comments",
-                    "Orchard.ContentTypes",
-                    "Orchard.jQuery",
-                    "Orchard.Lists",
-                    "Orchard.Media",
-                    "Orchard.Modules",
+                    
                     "Orchard.Pages",
-                    "Orchard.Recipes",
-                    "Orchard.Roles",
-                    "Orchard.Tags",
+                    "Orchard.Widgets",
                     "Orchard.Themes",
                     "Orchard.Users",
-                    "Orchard.Scripting",
-                    "Orchard.Scripting.Lightweight",
-                    "Orchard.Widgets",
-                    "TinyMce",
-
-                    // Gallery/Packaging
-                    "PackagingServices",
-                    "Orchard.Packaging",
-                    "Gallery",
-
-                    // Themes
-                    "TheThemeMachine",
+                    "Orchard.Roles",
+                    "Orchard.Modules",
+                    "Orchard.Recipes"
                 };
 
                 context.EnabledFeatures = hardcoded;