diff --git a/etcd/init.sls b/etcd/init.sls
index cddcbaa..cbdd5ee 100644
--- a/etcd/init.sls
+++ b/etcd/init.sls
@@ -3,4 +3,7 @@
 {%- if pillar.etcd.server is defined %}
 - etcd.server
 {%- endif %}
+{%- if pillar.etcd.server.setup is defined %}
+- etcd.setup
+{%- endif %}
 {%- endif %}
diff --git a/etcd/setup.sls b/etcd/setup.sls
new file mode 100644
index 0000000..13f417d
--- /dev/null
+++ b/etcd/setup.sls
@@ -0,0 +1,13 @@
+{%- from "etcd/map.jinja" import server with context %}
+{%- if server.enabled %}
+
+{%- for name,setup in server.setup.iteritems() %}
+
+{{ setup.key }}:
+  etcd.set:
+    - value: '{{ setup.value }}'
+
+{%- endfor %}
+
+
+{%- endif %}
\ No newline at end of file