diff --git a/manila/_common.sls b/manila/_common.sls
index 49b6f30..383222c 100644
--- a/manila/_common.sls
+++ b/manila/_common.sls
@@ -2,6 +2,7 @@
 
 include:
   - manila._ssl.mysql
+  - manila._ssl.rabbitmq
 
 manila_common.pkgs:
   pkg.installed:
@@ -9,6 +10,7 @@
     - install_recommends: False
     - require_in:
       - sls: manila._ssl.mysql
+      - sls: manila._ssl.rabbitmq
 
 /etc/manila/manila.conf:
   file.managed:
@@ -17,17 +19,4 @@
   - require:
     - pkg: manila_common.pkgs
     - sls: manila._ssl.mysql
-
-{%- if cfg.message_queue.get('ssl',{}).get('enabled', False) %}
-rabbitmq_ca_manila_file:
-{%- if cfg.message_queue.ssl.cacert is defined %}
-  file.managed:
-    - name: {{ cfg.message_queue.ssl.cacert_file }}
-    - contents_pillar: cfg.message_queue:ssl:cacert
-    - mode: 0444
-    - makedirs: true
-{%- else %}
-  file.exists:
-   - name: {{ cfg.message_queue.ssl.get('cacert_file', cfg.cacert_file) }}
-{%- endif %}
-{%- endif %}
+    - sls: manila._ssl.rabbitmq
diff --git a/manila/_ssl/rabbitmq.sls b/manila/_ssl/rabbitmq.sls
new file mode 100644
index 0000000..2ac3e1d
--- /dev/null
+++ b/manila/_ssl/rabbitmq.sls
@@ -0,0 +1,77 @@
+{% from "manila/map.jinja" import cfg with context %}
+
+manila_ssl_rabbitmq:
+  test.show_notification:
+    - text: "Running manila._ssl.rabbitmq"
+
+{%- if cfg.message_queue.get('x509',{}).get('enabled',False) %}
+
+  {%- set ca_file=cfg.message_queue.x509.ca_file %}
+  {%- set key_file=cfg.message_queue.x509.key_file %}
+  {%- set cert_file=cfg.message_queue.x509.cert_file %}
+
+rabbitmq_manila_ssl_x509_ca:
+  {%- if cfg.message_queue.x509.cacert is defined %}
+  file.managed:
+    - name: {{ ca_file }}
+    - contents_pillar: cfg.message_queue:x509:cacert
+    - mode: 444
+    - user: manila
+    - group: manila
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ ca_file }}
+  {%- endif %}
+
+rabbitmq_manila_client_ssl_cert:
+  {%- if cfg.message_queue.x509.cert is defined %}
+  file.managed:
+    - name: {{ cert_file }}
+    - contents_pillar: cfg.message_queue:x509:cert
+    - mode: 440
+    - user: manila
+    - group: manila
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ cert_file }}
+  {%- endif %}
+
+rabbitmq_manila_client_ssl_private_key:
+  {%- if cfg.message_queue.x509.key is defined %}
+  file.managed:
+    - name: {{ key_file }}
+    - contents_pillar: cfg.message_queue:x509:key
+    - mode: 400
+    - user: manila
+    - group: manila
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ key_file }}
+  {%- endif %}
+
+rabbitmq_manila_ssl_x509_set_user_and_group:
+  file.managed:
+    - names:
+      - {{ ca_file }}
+      - {{ cert_file }}
+      - {{ key_file }}
+    - user: manila
+    - group: manila
+
+  {% elif cfg.message_queue.get('ssl',{}).get('enabled',False) %}
+rabbitmq_ca_manila_file:
+  {%- if cfg.message_queue.ssl.cacert is defined %}
+  file.managed:
+    - name: {{ cfg.message_queue.ssl.cacert_file }}
+    - contents_pillar: cfg.message_queue:ssl:cacert
+    - mode: 0444
+    - makedirs: true
+  {%- else %}
+  file.exists:
+    - name: {{ cfg.message_queue.ssl.get('cacert_file', cfg.cacert_file) }}
+  {%- endif %}
+
+{%- endif %}
diff --git a/manila/files/pike/_oslo_messaging_rabbit.conf b/manila/files/pike/_oslo_messaging_rabbit.conf
index 5fd6a82..c17c12f 100644
--- a/manila/files/pike/_oslo_messaging_rabbit.conf
+++ b/manila/files/pike/_oslo_messaging_rabbit.conf
@@ -1,9 +1,15 @@
 {%- if _message_queue.get('ssl',{}).get('enabled', False) -%}
 rabbit_use_ssl=true
-{%- if _message_queue.ssl.version is defined %}
+  {%- if _message_queue.ssl.version is defined %}
 kombu_ssl_version = {{ _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 _message_queue.get('x509',{}).get('enabled', False) -%}
+kombu_ssl_ca_certs = {{ _message_queue.x509.ca_file}}
+kombu_ssl_keyfile = {{ _message_queue.x509.key_file}}
+kombu_ssl_certfile = {{ _message_queue.x509.cert_file}}
+  {%- else %}
 kombu_ssl_ca_certs = {{ _message_queue.ssl.cacert_file }}
+  {%- endif %}
 {%- endif %}