diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml
index ed55ff464a..1fb041da55 100644
--- a/stable/kibana/Chart.yaml
+++ b/stable/kibana/Chart.yaml
@@ -1,5 +1,5 @@
 name: kibana
-version: 0.6.0
+version: 0.6.1
 appVersion: 6.0.0
 description: Kibana is an open source data visualization plugin for Elasticsearch
 icon: https://raw.githubusercontent.com/elastic/kibana/master/src/ui/public/icons/kibana-color.svg
diff --git a/stable/kibana/templates/service.yaml b/stable/kibana/templates/service.yaml
index b01cea041c..8aad2b3902 100644
--- a/stable/kibana/templates/service.yaml
+++ b/stable/kibana/templates/service.yaml
@@ -6,6 +6,9 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- range $key, $value := .Values.service.labels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
   name: {{ template "kibana.fullname" . }}
   annotations:
     {{- range $key, $value := .Values.service.annotations }}
diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml
index f4fc03ab93..d2f485fa2e 100644
--- a/stable/kibana/values.yaml
+++ b/stable/kibana/values.yaml
@@ -33,6 +33,9 @@ service:
   annotations:
     # Annotation example: setup ssl with aws cert when service.type is LoadBalancer
     # service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-1:EXAMPLE_CERT
+  labels:
+    ## Label example: show service URL in `kubectl cluster-info`
+    # kubernetes.io/cluster-service: "true"
 
 ingress:
   enabled: false