diff --git a/heka/files/input/amqp.toml b/heka/files/input/amqp.toml
index fb00fb7..870731a 100644
--- a/heka/files/input/amqp.toml
+++ b/heka/files/input/amqp.toml
@@ -24,3 +24,16 @@
 {% endif %}
 decoder = "{{ values.decoder }}"
 splitter = "{{ values.splitter }}"
+
+{%- if values.ssl is defined %}
+[input_{{ name }}.tls]
+cert_file = "{{ values.ssl.cert_file }}"
+key_file = "{{ values.ssl.key_file }}"
+{%- if values.ssl.ca_file is defined %}
+root_cafile = "{{ values.ssl.ca_file }}"
+{%- endif %}
+{%- endif %}
+
+{#-
+vim: syntax=jinja
+-#}
diff --git a/heka/files/output/amqp.toml b/heka/files/output/amqp.toml
index 4229d5d..3305a4e 100644
--- a/heka/files/output/amqp.toml
+++ b/heka/files/output/amqp.toml
@@ -12,6 +12,15 @@
 delay = "{{ values.get('delay', '250ms') }}"
 max_retries = {{ values.get('max_retries', '-1') }}
 
+{%- if values.ssl is defined %}
+[AMQPOutput_{{ name }}.tls]
+cert_file = "{{ values.ssl.cert_file }}"
+key_file = "{{ values.ssl.key_file }}"
+{%- if values.ssl.ca_file is defined %}
+root_cafile = "{{ values.ssl.ca_file }}"
+{%- endif %}
+{%- endif %}
+
 {#-
 vim: syntax=jinja
 -#}
diff --git a/heka/server.sls b/heka/server.sls
index 1bb2744..cbe91d9 100644
--- a/heka/server.sls
+++ b/heka/server.sls
@@ -13,6 +13,16 @@
   - require:
     - pkg: heka_packages
 
+heka_ssl:
+  file.directory:
+  - name: /etc/heka/ssl
+  - user: root
+  - group: heka
+  - mode: 750
+  - require:
+    - pkg: heka_packages
+    - user: heka_user
+
 /etc/heka/conf.d/00-hekad.toml:
   file.managed:
   - source: salt://heka/files/00-hekad.toml