diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb9af5a1d9f..d4bb6eac1c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Unreleased Changes
 ------------------
 
+* Issue - Aws::AutoScaling - Fixes the waiter and resource definitions.
+
+  See [related GitHub issue #1101](https://github.com/aws/aws-sdk-ruby/issues/1101)
+
+  See [related GitHub issue #1109](https://github.com/aws/aws-sdk-ruby/issues/1109)
+
 2.2.20 (2016-02-25)
 ------------------
 
diff --git a/aws-sdk-core/apis/autoscaling/2011-01-01/resources-1.json b/aws-sdk-core/apis/autoscaling/2011-01-01/resources-1.json
index 7c4f229488a..ebac6be6d78 100644
--- a/aws-sdk-core/apis/autoscaling/2011-01-01/resources-1.json
+++ b/aws-sdk-core/apis/autoscaling/2011-01-01/resources-1.json
@@ -94,7 +94,7 @@
                         {
                             "target": "Id",
                             "source": "response",
-                            "path": "Activites[].ActivityId"
+                            "path": "Activities[].ActivityId"
                         }
                     ],
                     "path": "Activities[]"
@@ -591,7 +591,7 @@
                             {
                                 "target": "Id",
                                 "source": "response",
-                                "path": "Activites[].ActivityId"
+                                "path": "Activities[].ActivityId"
                             }
                         ],
                         "path": "Activities[]"
diff --git a/aws-sdk-core/apis/autoscaling/2011-01-01/waiters-2.json b/aws-sdk-core/apis/autoscaling/2011-01-01/waiters-2.json
index 740fc7731f8..76ee9983d42 100644
--- a/aws-sdk-core/apis/autoscaling/2011-01-01/waiters-2.json
+++ b/aws-sdk-core/apis/autoscaling/2011-01-01/waiters-2.json
@@ -4,15 +4,15 @@
         "GroupExists": {
             "acceptors": [
                 {
-                    "argument": "length(AutoScalingGroups)",
-                    "expected": 1,
-                    "matcher": "pathAll",
+                    "argument": "length(AutoScalingGroups) > `0`",
+                    "expected": true,
+                    "matcher": "path",
                     "state": "success"
                 },
                 {
-                    "argument": "length(AutoScalingGroups)",
-                    "expected": 0,
-                    "matcher": "pathAll",
+                    "argument": "length(AutoScalingGroups) > `0`",
+                    "expected": false,
+                    "matcher": "path",
                     "state": "retry"
                 }
             ],
@@ -25,13 +25,13 @@
                 {
                     "argument": "contains(AutoScalingGroups[].[length(Instances[?LifecycleState=='InService']) >= MinSize][], `false`)",
                     "expected": false,
-                    "matcher": "pathAll",
+                    "matcher": "path",
                     "state": "success"
                 },
                 {
                     "argument": "contains(AutoScalingGroups[].[length(Instances[?LifecycleState=='InService']) >= MinSize][], `false`)",
                     "expected": true,
-                    "matcher": "pathAll",
+                    "matcher": "path",
                     "state": "retry"
                 }
             ],
@@ -42,15 +42,15 @@
         "GroupNotExists": {
             "acceptors": [
                 {
-                    "argument": "length(AutoScalingGroups)",
-                    "expected": 0,
-                    "matcher": "pathAll",
+                    "argument": "length(AutoScalingGroups) > `0`",
+                    "expected": false,
+                    "matcher": "path",
                     "state": "success"
                 },
                 {
-                    "argument": "length(AutoScalingGroups)",
-                    "expected": 1,
-                    "matcher": "pathAll",
+                    "argument": "length(AutoScalingGroups) > `0`",
+                    "expected": true,
+                    "matcher": "path",
                     "state": "retry"
                 }
             ],