diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
index 14072b575..30fcadb25 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
@@ -83,7 +83,7 @@
     <Compile Include="Models\VersionHistoryOptions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RecipeBuilders\DataRecipeBuilderStep.cs" />
-    <Compile Include="RecipeBuilders\SetupRecipeBuilderStep.cs" />
+    <Compile Include="RecipeBuilders\RecipeMetadataBuilderStep.cs" />
     <Compile Include="RecipeBuilders\SiteSettingsBuilderStep.cs" />
     <Compile Include="RecipeHandlers\CommandRecipeHandler.cs" />
     <Compile Include="RecipeHandlers\DataRecipeHandler.cs" />
@@ -149,7 +149,7 @@
     <Content Include="Views\EditorTemplates\ExportSteps\Data.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\EditorTemplates\ExportSteps\SetupRecipe.cshtml" />
+    <Content Include="Views\EditorTemplates\ExportSteps\RecipeMetadata.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\EditorTemplates\ExportSteps\SiteSettings.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SetupRecipeBuilderStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/RecipeMetadataBuilderStep.cs
similarity index 84%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SetupRecipeBuilderStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/RecipeMetadataBuilderStep.cs
index 6eb712abe..a09be4bcb 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SetupRecipeBuilderStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/RecipeMetadataBuilderStep.cs
@@ -4,22 +4,22 @@ using Orchard.Recipes.Services;
 using Orchard.Recipes.ViewModels;
 
 namespace Orchard.Recipes.RecipeBuilders {
-    public class SetupRecipeBuilderStep : RecipeBuilderStep {
+    public class RecipeMetadataBuilderStep : RecipeBuilderStep {
         private readonly IOrchardServices _orchardServices;
-        public SetupRecipeBuilderStep(IOrchardServices orchardServices) {
+        public RecipeMetadataBuilderStep(IOrchardServices orchardServices) {
             _orchardServices = orchardServices;
         }
 
         public override string Name {
-            get { return "SetupRecipe"; }
+            get { return "RecipeMetadata"; }
         }
 
         public override LocalizedString DisplayName {
-            get { return T("Setup Recipe"); }
+            get { return T("Recipe Metadata"); }
         }
 
         public override LocalizedString Description {
-            get { return T("Turns the export file into a Setup recipe."); }
+            get { return T("Provides additional information about the recipe."); }
         }
 
         public override int Priority { get { return -10; } }
@@ -48,10 +48,10 @@ namespace Orchard.Recipes.RecipeBuilders {
                 RecipeWebsite = viewModel.RecipeWebsite;
                 RecipeTags = viewModel.RecipeTags;
                 RecipeVersion = viewModel.RecipeVersion;
-                IsSetupRecipe = true;
+                IsSetupRecipe = viewModel.IsSetupRecipe;
             }
 
-            return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/SetupRecipe", Model: viewModel, Prefix: Prefix);
+            return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/RecipeMetadata", Model: viewModel, Prefix: Prefix);
         }
 
         public override void Build(BuildContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/SetupRecipeStepViewModel.cs b/src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/SetupRecipeStepViewModel.cs
index ed354250d..74f20bb24 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/SetupRecipeStepViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/SetupRecipeStepViewModel.cs
@@ -6,5 +6,6 @@ namespace Orchard.Recipes.ViewModels {
         public string RecipeWebsite { get; set; }
         public string RecipeTags { get; set; }
         public string RecipeVersion { get; set; }
+        public bool IsSetupRecipe { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/SetupRecipe.cshtml b/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/RecipeMetadata.cshtml
similarity index 80%
rename from src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/SetupRecipe.cshtml
rename to src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/RecipeMetadata.cshtml
index 71a872128..6c6878686 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/SetupRecipe.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/RecipeMetadata.cshtml
@@ -26,6 +26,11 @@
 </div>
 <div>
     @Html.LabelFor(m => m.RecipeVersion, T("Version"))
-    @Html.TextBoxFor(m => m.RecipeVersion, new { @class = "text small" })
+    @Html.TextBoxFor(m => m.RecipeVersion, new {@class = "text small"})
     @Html.Hint(T("Optionally provide a version for the setup recipe."))
+</div>
+<div>
+    @Html.CheckBoxFor(m => m.IsSetupRecipe)
+    @Html.LabelFor(m => m.IsSetupRecipe, T("Is Setup Recipe").ToString(), new { @class = "forcheckbox" })
+    @Html.Hint(T("Check this option to make this a Setup recipe."))
 </div>
\ No newline at end of file