diff --git a/cluster/aws/templates/salt-master.sh b/cluster/aws/templates/salt-master.sh
index 69e55c9ee2e..7e50aec2d32 100755
--- a/cluster/aws/templates/salt-master.sh
+++ b/cluster/aws/templates/salt-master.sh
@@ -26,11 +26,8 @@ grains:
 EOF
 
 cat <<EOF > /etc/aws.conf
-{
-  "Global": {
-    "Region": "${AWS_ZONE}"
-  }
-}
+[Global]
+Region:${AWS_ZONE}
 EOF
 
 # Auto accept all keys from minions that try to join
diff --git a/cluster/saltbase/salt/kube-controller-manager/default b/cluster/saltbase/salt/kube-controller-manager/default
index acbf113ec8d..a1d1de23252 100644
--- a/cluster/saltbase/salt/kube-controller-manager/default
+++ b/cluster/saltbase/salt/kube-controller-manager/default
@@ -7,6 +7,7 @@
 
 {% set machines = ""%}
 {% set cloud_provider = "" %}
+{% set cloud_config = "" %}
 {% set minion_regexp = "-minion_regexp=.*" %}
 {% if grains.cloud_provider is defined %}
   {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %}
@@ -22,8 +23,8 @@
   {% set machines = "-machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %}
 {% endif %}
 {% if grains.cloud == 'aws' %}
-  # TODO: turn on AWS as a cloud provider.  Need to figure out AWS role-based auth.
-  {% set cloud_provider = "" %}
+  {% set cloud_provider = "-cloud_provider=aws" %}
+  {% set cloud_config = "-cloud_config=/etc/aws.conf" %}
   {% set minion_regexp = "" %}
   {% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %}
 {% endif %}
@@ -46,4 +47,4 @@
 {% endif %}
 {% endif %}
 
-DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }}"
+DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{ cloud_config }}"