diff --git a/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.controller.ts b/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.controller.ts
index b7cf3d5c5eb..35fcfa14d89 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.controller.ts
+++ b/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.controller.ts
@@ -48,4 +48,12 @@ export class DeployCloudFormationStackConfigController implements IController {
       this.cloudFormationStackArtifactController.accountsForArtifact.length > 1
     );
   }
+
+  public isChangeSet() {
+    return this.$scope.stage.isChangeSet;
+  }
+
+  public toggleChangeSet() {
+    this.$scope.stage.isChangeSet = !this.$scope.stage.isChangeSet;
+  }
 }
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.html b/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.html
index a3534f9760b..f39bf0b2d51 100644
--- a/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.html
+++ b/app/scripts/modules/amazon/src/pipeline/stages/deployCloudFormation/deployCloudFormationStackConfig.html
@@ -16,7 +16,19 @@ <h4>Template Configuration</h4>
         <label class="sm-label-right">
           <input type="text" class="form-control input-sm" required ng-model="stage.stackName" />
         </label>
+        <br />
+        <label>
+          <input type="checkbox" ng-checked="ctrl.isChangeSet()" ng-click="ctrl.toggleChangeSet()" />
+          <strong>Create CloudFormation ChangeSet</strong>
+        </label>
       </stage-config-field>
+      <div ng-if="ctrl.isChangeSet()">
+        <stage-config-field label="ChangeSet name">
+          <label class="sm-label-right">
+            <input type="text" class="form-control input-sm" ng-model="stage.changeSetName" />
+          </label>
+        </stage-config-field>
+      </div>
       <stage-config-field label="Source" help-key="aws.cloudformation.source">
         <label class="sm-label-right">
           <input type="radio" ng-model="ctrl.$scope.stage.source" value="{{ctrl.textSource}}" />