diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml
index 02f2f9b693..7ab76cb7f0 100644
--- a/stable/rabbitmq/Chart.yaml
+++ b/stable/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 2.1.1
+version: 2.1.2
 appVersion: 3.7.7
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/stable/rabbitmq/templates/NOTES.txt b/stable/rabbitmq/templates/NOTES.txt
index eb751c76e3..2bbe9f8f11 100644
--- a/stable/rabbitmq/templates/NOTES.txt
+++ b/stable/rabbitmq/templates/NOTES.txt
@@ -4,8 +4,8 @@
 Credentials:
 
     Username      : {{ .Values.rabbitmq.username }}
-    echo Password      : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath="{.data.rabbitmq-password}" | base64 --decode)
-    echo ErLang Cookie : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath="{.data.rabbitmq-erlang-cookie}" | base64 --decode)
+    echo "Password      : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath="{.data.rabbitmq-password}" | base64 --decode)"
+    echo "ErLang Cookie : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath="{.data.rabbitmq-erlang-cookie}" | base64 --decode)"
 
 RabbitMQ can be accessed within the cluster on port {{ .Values.rabbitmq.nodePort }} at {{ template "rabbitmq.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
 
@@ -21,11 +21,11 @@ Obtain the NodePort IP and ports:
 
 To Access the RabbitMQ AMQP port:
 
-    echo URL : amqp://$NODE_IP:$NODE_PORT_AMQP/
+    echo "URL : amqp://$NODE_IP:$NODE_PORT_AMQP/"
 
 To Access the RabbitMQ Management interface:
 
-    echo URL : http://$NODE_IP:$NODE_PORT_STATS/
+    echo "URL : http://$NODE_IP:$NODE_PORT_STATS/"
 
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
@@ -38,24 +38,22 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
 
 To Access the RabbitMQ AMQP port:
 
-    echo URL : amqp://$SERVICE_IP:{{ .Values.rabbitmq.nodePort }}/
+    echo "URL : amqp://$SERVICE_IP:{{ .Values.rabbitmq.nodePort }}/"
 
 To Access the RabbitMQ Management interface:
 
-    echo URL : http://$SERVICE_IP:{{ .Values.rabbitmq.managerPort }}/
+    echo "URL : http://$SERVICE_IP:{{ .Values.rabbitmq.managerPort }}/"
 
 {{- else if contains "ClusterIP"  .Values.serviceType }}
 
-Create a proxy server between localhost and the Kubernetes API Server:
-
-    kubectl proxy --port 8002
-
 To Access the RabbitMQ AMQP port:
 
-    URL : amqp://127.0.0.1:8002/api/v1/proxy/namespaces/{{ .Release.Namespace }}/services/{{ template "rabbitmq.fullname" . }}:{{ .Values.rabbitmq.nodePort }}/
+    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "rabbitmq.fullname" . }} {{ .Values.rabbitmq.nodePort }}:{{ .Values.rabbitmq.nodePort }}
+    echo "URL : amqp://127.0.0.1:{{ .Values.rabbitmq.nodePort }}/"
 
 To Access the RabbitMQ Management interface:
 
-    URL : http://127.0.0.1:8002/api/v1/proxy/namespaces/{{ .Release.Namespace }}/services/{{ template "rabbitmq.fullname" . }}:{{ .Values.rabbitmq.managerPort }}/
+    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "rabbitmq.fullname" . }} {{ .Values.rabbitmq.managerPort }}:{{ .Values.rabbitmq.managerPort }}
+    echo "URL : http://127.0.0.1:{{ .Values.rabbitmq.managerPort }}/"
 
 {{- end }}