diff --git a/heat/_ssl/rabbitmq.sls b/heat/_ssl/rabbitmq.sls
new file mode 100644
index 0000000..4553d2f
--- /dev/null
+++ b/heat/_ssl/rabbitmq.sls
@@ -0,0 +1,77 @@
+{%- from "heat/map.jinja" import server with context %}
+
+heat_ssl_rabbitmq:
+  test.show_notification:
+    - text: "Running heat._ssl.rabbitmq"
+
+{%- if server.message_queue.get('x509',{}).get('enabled',False) %}
+
+  {%- set ca_file=server.message_queue.x509.ca_file %}
+  {%- set key_file=server.message_queue.x509.key_file %}
+  {%- set cert_file=server.message_queue.x509.cert_file %}
+
+rabbitmq_heat_ssl_x509_ca:
+  {%- if server.message_queue.x509.cacert is defined %}
+  file.managed:
+    - name: {{ ca_file }}
+    - contents_pillar: heat:server:message_queue:x509:cacert
+    - mode: 444
+    - user: heat
+    - group: heat
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ ca_file }}
+  {%- endif %}
+
+rabbitmq_heat_client_ssl_cert:
+  {%- if server.message_queue.x509.cert is defined %}
+  file.managed:
+    - name: {{ cert_file }}
+    - contents_pillar: heat:server:message_queue:x509:cert
+    - mode: 440
+    - user: heat
+    - group: heat
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ cert_file }}
+  {%- endif %}
+
+rabbitmq_heat_client_ssl_private_key:
+  {%- if server.message_queue.x509.key is defined %}
+  file.managed:
+    - name: {{ key_file }}
+    - contents_pillar: heat:server:message_queue:x509:key
+    - mode: 400
+    - user: heat
+    - group: heat
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ key_file }}
+  {%- endif %}
+
+rabbitmq_heat_ssl_x509_set_user_and_group:
+  file.managed:
+    - names:
+      - {{ ca_file }}
+      - {{ cert_file }}
+      - {{ key_file }}
+    - user: heat
+    - group: heat
+
+{% elif server.message_queue.get('ssl',{}).get('enabled',False) %}
+rabbitmq_ca_heat_client:
+  {%- if server.message_queue.ssl.cacert is defined %}
+  file.managed:
+    - name: {{ server.message_queue.ssl.cacert_file }}
+    - contents_pillar: heat:server:message_queue:ssl:cacert
+    - mode: 0444
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ server.message_queue.ssl.get('cacert_file', server.cacert_file) }}
+  {%- endif %}
+
+{%- endif %}
diff --git a/heat/files/pike/heat.conf.Debian b/heat/files/pike/heat.conf.Debian
index 9b551ac..ceabe6b 100644
--- a/heat/files/pike/heat.conf.Debian
+++ b/heat/files/pike/heat.conf.Debian
@@ -2109,13 +2109,17 @@
 
 {%- if server.message_queue.get('ssl',{}).get('enabled', False) %}
 rabbit_use_ssl=true
-{%- if server.message_queue.ssl.version is defined %}
+  {%- if server.message_queue.ssl.version is defined %}
 kombu_ssl_version = {{ server.message_queue.ssl.version }}
-{%- elif salt['grains.get']('pythonversion') > [2,7,8] %}
+  {%- elif salt['grains.get']('pythonversion') > [2,7,8] %}
 kombu_ssl_version = TLSv1_2
-{%- endif %}
-
+  {%- endif %}
+  {%- if server.message_queue.get('x509',{}).get('enabled', False) %}
+kombu_ssl_keyfile = {{ server.message_queue.x509.key_file}}
+kombu_ssl_certfile = {{ server.message_queue.x509.cert_file}}
+  {%- endif %}
 kombu_ssl_ca_certs = {{ server.message_queue.ssl.get('cacert_file', server.cacert_file) }}
+
 {%- endif %}
 
 # Use durable queues in AMQP. (boolean value)
diff --git a/heat/server.sls b/heat/server.sls
index 3323fe0..02e73b4 100644
--- a/heat/server.sls
+++ b/heat/server.sls
@@ -5,12 +5,14 @@
 include:
   - heat.db.offline_sync
   - heat._ssl.mysql
+  - heat._ssl.rabbitmq
 
 heat_server_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
   - require_in:
     - sls: heat._ssl.mysql
+    - sls: heat._ssl.rabbitmq
     - sls: heat.db.offline_sync
 
 /etc/heat/heat.conf:
@@ -22,6 +24,7 @@
   - require:
     - pkg: heat_server_packages
     - sls: heat._ssl.mysql
+    - sls: heat._ssl.rabbitmq
   - require_in:
     - sls: heat.db.offline_sync
 
@@ -163,6 +166,7 @@
     - file: /etc/heat/heat.conf
     - pkg: heat_server_packages
     - sls: heat._ssl.mysql
+    - sls: heat._ssl.rabbitmq
     - sls: heat.db.offline_sync
 
 {%- endif %}
@@ -191,6 +195,7 @@
   - require:
     - sls: heat.db.offline_sync
     - sls: heat._ssl.mysql
+    - sls: heat._ssl.rabbitmq
   - watch:
     - file: /etc/heat/heat.conf
     - file: /etc/heat/api-paste.ini