diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 71eaa462d8..105450220f 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 1.5.1
+version: 1.6.0
 appVersion: 5.0.4
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net
diff --git a/stable/grafana/README.md b/stable/grafana/README.md
index dea0c82d89..fe829296fa 100644
--- a/stable/grafana/README.md
+++ b/stable/grafana/README.md
@@ -65,4 +65,4 @@ The command removes all the Kubernetes components associated with the chart and
 | `ldap.config  `            | Grafana's LDAP configuration    | `""` |
 | `annotations`              | Deployment annotations | `{}` |
 | `podAnnotations`           | Pod annotations | `{}` |
-
+| `smtp.existingSecret`      | The name of an existing secret containing the SMTP credentials, this must have the keys `user` and `password`. | `""` |
diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml
index 27605edc45..d43103322e 100644
--- a/stable/grafana/templates/deployment.yaml
+++ b/stable/grafana/templates/deployment.yaml
@@ -108,6 +108,18 @@ spec:
                   name: {{ template "grafana.fullname" . }}
                   key: plugins
             {{- end }}
+            {{- if .Values.smtp.existingSecret }}
+            - name: GF_SMTP_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.smtp.existingSecret }}
+                  key: user
+            - name: GF_SMTP_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.smtp.existingSecret }}
+                  key: password
+            {{- end }}
 {{- range $key, $value := .Values.env }}
             - name: "{{ $key }}"
               value: "{{ $value }}"
@@ -150,7 +162,7 @@ spec:
             {{- if .Values.ldap.existingSecret }}
             secretName: {{ .Values.ldap.existingSecret }}
             {{- else }}
-            secretName: {{ template "grafana.fullname" . }}            
+            secretName: {{ template "grafana.fullname" . }}
             {{- end }}
             items:
               - key: ldap-toml
@@ -162,4 +174,4 @@ spec:
       {{- else }}
           emptyDir: {}
       {{- end -}}
-        
+
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index 768adeefc3..3a6898939b 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -185,3 +185,11 @@ ldap:
   #   start_tls = false
   #   ssl_skip_verify = false
   #   bind_dn = "uid=%s,ou=users,dc=myorg,dc=com"
+
+## Grafana's SMTP configuration
+## NOTE: To enable, grafana.ini must be configured with smtp.enabled
+## ref: http://docs.grafana.org/installation/configuration/#smtp
+smtp:
+  # `existingSecret` is a reference to an existing secret containing the smtp configuration
+  # for Grafana in keys `user` and `password`.
+  existingSecret: ""