diff --git a/CHANGELOG.md b/CHANGELOG.md
index 117e4ab7a12..5e7e33e8095 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Unreleased Changes
 ------------------
 
+* Feature - Aws::CloudFormation - Added `Aws::CloudFormation::Stack#exists?`
+  operation via a new `:stack_exists` waiter.
+
 2.2.0 (2015-11-12)
 ------------------
 
diff --git a/aws-sdk-core/apis/cloudformation/2010-05-15/resources-1.json b/aws-sdk-core/apis/cloudformation/2010-05-15/resources-1.json
index 31e017c0570..5fa2e6f7395 100644
--- a/aws-sdk-core/apis/cloudformation/2010-05-15/resources-1.json
+++ b/aws-sdk-core/apis/cloudformation/2010-05-15/resources-1.json
@@ -94,6 +94,14 @@
           }
         }
       },
+      "waiters": {
+        "Exists": {
+          "waiterName": "StackExists",
+          "params": [
+            { "target": "StackName", "source": "identifier", "name": "Name" }
+          ]
+        }
+      },
       "has": {
         "Resource": {
           "resource": {
diff --git a/aws-sdk-core/apis/cloudformation/2010-05-15/waiters-2.json b/aws-sdk-core/apis/cloudformation/2010-05-15/waiters-2.json
index 31f77cc4d3b..6dfa6357ce9 100644
--- a/aws-sdk-core/apis/cloudformation/2010-05-15/waiters-2.json
+++ b/aws-sdk-core/apis/cloudformation/2010-05-15/waiters-2.json
@@ -1,6 +1,23 @@
 {
   "version": 2,
   "waiters": {
+    "StackExists": {
+      "delay": 5,
+      "operation": "DescribeStacks",
+      "maxAttempts": 20,
+      "acceptors": [
+        {
+          "matcher": "status",
+          "expected": 200,
+          "state": "success"
+        },
+        {
+          "matcher": "error",
+          "expected": "ValidationError",
+          "state": "retry"
+        }
+      ]
+    },
     "StackCreateComplete": {
       "delay": 30,
       "operation": "DescribeStacks",