diff --git a/lib/stackup/change_set.rb b/lib/stackup/change_set.rb
index 317cde1..76f2a4f 100644
--- a/lib/stackup/change_set.rb
+++ b/lib/stackup/change_set.rb
@@ -65,7 +65,8 @@ def create(options = {})
           when /COMPLETE/
             return current.status
           when "FAILED"
-            if allow_empty_change_set && (current.status_reason == "The submitted information didn't contain changes. Submit different information to create a change set.")
+            # following the AWS CLI way: https://github.com/aws/aws-cli/blob/develop/awscli/customizations/cloudformation/deployer.py#L171
+            if allow_empty_change_set && (current.status_reason.include? "The submitted information didn't contain changes." or current.status_reason.include? "No updates are to be performed")
               return current.status_reason
             end