diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4709291f6cf..2a108c514b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+* Issue - Aws::CloudFormation - Added support for rollback states to the
+  `Aws::CloudFormation::Client#wait_until` `:stack_create_complete` waiter.
+
+  See [related GitHub issue #931](https://github.com/aws/aws-sdk-ruby/issues/931).
+
 * Feature - Aws::AssumeRoleCredentials - Added support for passing
   `Aws::STS::Client` configuration options to `Aws::AssumeRoleCredentials#initialize`.
   This allows you to configure things such as `:region`, `:logger`, etc without
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 8daeb7c762a..31f77cc4d3b 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
@@ -18,6 +18,18 @@
           "matcher": "pathAny",
           "state": "failure",
           "argument": "Stacks[].StackStatus"
+        },
+        {
+          "expected": "ROLLBACK_COMPLETE",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "Stacks[].StackStatus"
+        },
+        {
+          "expected": "ROLLBACK_FAILED",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "Stacks[].StackStatus"
         }
       ]
     },