diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml
index cc27d42de0..dbd522c371 100644
--- a/stable/kube-state-metrics/Chart.yaml
+++ b/stable/kube-state-metrics/Chart.yaml
@@ -5,8 +5,8 @@ keywords:
 - metric
 - monitoring
 - prometheus
-version: 1.2.0
-appVersion: 1.5.0
+version: 1.3.0
+appVersion: 1.6.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:
 - https://github.com/kubernetes/kube-state-metrics/
diff --git a/stable/kube-state-metrics/README.md b/stable/kube-state-metrics/README.md
index 3abd656065..bcf1b4dacd 100644
--- a/stable/kube-state-metrics/README.md
+++ b/stable/kube-state-metrics/README.md
@@ -14,8 +14,8 @@ $ helm install stable/kube-state-metrics
 
 | Parameter                             | Description                                             | Default                                     |
 |---------------------------------------|---------------------------------------------------------|---------------------------------------------|
-| `image.repository`                    | The image repository to pull from                       | k8s.gcr.io/kube-state-metrics               |
-| `image.tag`                           | The image tag to pull from                              | `v1.5.0`                                    |
+| `image.repository`                    | The image repository to pull from                       | quay.io/coreos/kube-state-metrics           |
+| `image.tag`                           | The image tag to pull from                              | `v1.6.0`                                    |
 | `image.pullPolicy`                    | Image pull policy                                       | IfNotPresent                                |
 | `replicas`                            | Number of replicas                                      | 1                                           |
 | `service.port`                        | The port of the container                               | 8080                                        |
@@ -35,12 +35,14 @@ $ helm install stable/kube-state-metrics
 | `tolerations`                         | Tolerations for pod assignment	                      | []                                          |
 | `podAnnotations`                      | Annotations to be added to the pod                      | {}                                          |
 | `resources`                           | kube-state-metrics resource requests and limits         | {}                                          |
+| `collectors.certificatesigningrequests` | Enable the certificatesigningrequests collector.      | true                                        |
 | `collectors.configmaps`               | Enable the configmaps collector.                        | true                                        |
 | `collectors.cronjobs`                 | Enable the cronjobs collector.                          | true                                        |
 | `collectors.daemonsets`               | Enable the daemonsets collector.                        | true                                        |
 | `collectors.deployments`              | Enable the deployments collector.                       | true                                        |
 | `collectors.endpoints`                | Enable the endpoints collector.                         | true                                        |
 | `collectors.horizontalpodautoscalers` | Enable the horizontalpodautoscalers collector.          | true                                        |
+| `collectors.ingresses`                | Enable the ingresses collector.                         | true                                        |
 | `collectors.jobs`                     | Enable the jobs collector.                              | true                                        |
 | `collectors.limitranges`              | Enable the limitranges collector.                       | true                                        |
 | `collectors.namespaces`               | Enable the namespaces collector.                        | true                                        |
diff --git a/stable/kube-state-metrics/templates/clusterrole.yaml b/stable/kube-state-metrics/templates/clusterrole.yaml
index 803b73b00d..2c59adf5f6 100644
--- a/stable/kube-state-metrics/templates/clusterrole.yaml
+++ b/stable/kube-state-metrics/templates/clusterrole.yaml
@@ -9,6 +9,12 @@ metadata:
     release: {{ .Release.Name }}
   name: {{ template "kube-state-metrics.fullname" . }}
 rules:
+{{ if .Values.collectors.certificatesigningrequests }}
+- apiGroups: ["certificates.k8s.io"]
+  resources:
+  - certificatesigningrequests
+  verbs: ["list", "watch"]
+{{ end -}}
 {{ if .Values.collectors.configmaps }}
 - apiGroups: [""]
   resources:
@@ -22,13 +28,13 @@ rules:
   verbs: ["list", "watch"]
 {{ end -}}
 {{ if .Values.collectors.daemonsets }}
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "apps"]
   resources:
   - daemonsets
   verbs: ["list", "watch"]
 {{ end -}}
 {{ if .Values.collectors.deployments }}
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "apps"]
   resources:
   - deployments
   verbs: ["list", "watch"]
@@ -45,6 +51,12 @@ rules:
   - horizontalpodautoscalers
   verbs: ["list", "watch"]
 {{ end -}}
+{{ if .Values.collectors.ingresses }}
+- apiGroups: ["extensions"]
+  resources:
+  - ingresses
+  verbs: ["list", "watch"]
+{{ end -}}
 {{ if .Values.collectors.jobs }}
 - apiGroups: ["batch"]
   resources:
@@ -94,7 +106,7 @@ rules:
   verbs: ["list", "watch"]
 {{ end -}}
 {{ if .Values.collectors.replicasets }}
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "apps"]
   resources:
   - replicasets
   verbs: ["list", "watch"]
diff --git a/stable/kube-state-metrics/templates/deployment.yaml b/stable/kube-state-metrics/templates/deployment.yaml
index f2f25c1530..125d4fafac 100644
--- a/stable/kube-state-metrics/templates/deployment.yaml
+++ b/stable/kube-state-metrics/templates/deployment.yaml
@@ -32,6 +32,9 @@ spec:
       containers:
       - name: {{ .Chart.Name }}
         args:
+{{  if .Values.collectors.certificatesigningrequests  }}
+        - --collectors=certificatesigningrequests
+{{  end  }}
 {{  if .Values.collectors.configmaps  }}
         - --collectors=configmaps
 {{  end  }}
@@ -50,6 +53,9 @@ spec:
 {{  if .Values.collectors.horizontalpodautoscalers  }}
         - --collectors=horizontalpodautoscalers
 {{  end  }}
+{{  if .Values.collectors.ingresses  }}
+        - --collectors=ingresses
+{{  end  }}
 {{  if .Values.collectors.jobs  }}
         - --collectors=jobs
 {{  end  }}
diff --git a/stable/kube-state-metrics/values.yaml b/stable/kube-state-metrics/values.yaml
index bf1e0ee69a..05626e8a69 100644
--- a/stable/kube-state-metrics/values.yaml
+++ b/stable/kube-state-metrics/values.yaml
@@ -1,8 +1,8 @@
 # Default values for kube-state-metrics.
 prometheusScrape: true
 image:
-  repository: k8s.gcr.io/kube-state-metrics
-  tag: v1.5.0
+  repository: quay.io/coreos/kube-state-metrics
+  tag: v1.6.0
   pullPolicy: IfNotPresent
 
 replicas: 1
@@ -74,12 +74,14 @@ podAnnotations: {}
 # Available collectors for kube-state-metrics. By default all available
 # collectors are enabled.
 collectors:
+  certificatesigningrequests: true
   configmaps: true
   cronjobs: true
   daemonsets: true
   deployments: true
   endpoints: true
   horizontalpodautoscalers: true
+  ingresses: true
   jobs: true
   limitranges: true
   namespaces: true