diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml
index 529ffe3c54..31d2b7e3bf 100644
--- a/stable/rabbitmq/Chart.yaml
+++ b/stable/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 3.6.1
+version: 3.6.2
 appVersion: 3.7.8
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/stable/rabbitmq/README.md b/stable/rabbitmq/README.md
index 6320892716..e957170640 100644
--- a/stable/rabbitmq/README.md
+++ b/stable/rabbitmq/README.md
@@ -60,7 +60,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and
 | `rabbitmq.erlangCookie`              | Erlang cookie                                    | _random 32 character long alphanumeric string_          |
 | `rabbitmq.amqpPort`                  | Amqp port                                        | `5672`                                                  |
 | `rabbitmq.distPort`                  | Erlang distribution server port                  | `25672`                                                 |
-| `rabbitmq.nodePort`                  | Node port override, if serviceType NodePort      | _random avaliable between 30000-32767_                  |
+| `rabbitmq.nodePort`                  | Node port override, if serviceType NodePort      | _random available between 30000-32767_                  |
 | `rabbitmq.managerPort`               | RabbitMQ Manager port                            | `15672`                                                 |
 | `rabbitmq.diskFreeLimit`             | Disk free limit                                  | `"6GiB"`                                                |
 | `rabbitmq.plugins`                   | configuration file for plugins to enable         | `[rabbitmq_management,rabbitmq_peer_discovery_k8s].`    |
diff --git a/stable/rabbitmq/templates/NOTES.txt b/stable/rabbitmq/templates/NOTES.txt
index f7794c7521..43e752b6aa 100644
--- a/stable/rabbitmq/templates/NOTES.txt
+++ b/stable/rabbitmq/templates/NOTES.txt
@@ -38,7 +38,7 @@ 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.amqpPort }}/"
 
 To Access the RabbitMQ Management interface:
 
@@ -48,8 +48,8 @@ To Access the RabbitMQ Management interface:
 
 To Access the RabbitMQ AMQP port:
 
-    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 }}/"
+    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "rabbitmq.fullname" . }} {{ .Values.rabbitmq.amqpPort }}:{{ .Values.rabbitmq.amqpPort }}
+    echo "URL : amqp://127.0.0.1:{{ .Values.rabbitmq.amqpPort }}/"
 
 To Access the RabbitMQ Management interface: