diff --git a/README.rst b/README.rst
index e13f6d0..e85118f 100644
--- a/README.rst
+++ b/README.rst
@@ -11,4 +11,10 @@ Install a minion
 salt.master
 ===========
 
-Install a master
+Install a master. Every option available in the master template can be set in the pillar file:
+
+    salt:
+      ret_port: 4506
+      master:
+        user: saltuser
+        ...
\ No newline at end of file
diff --git a/salt/master.sls b/salt/master.sls
index 7b71c88..bcb404d 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -15,3 +15,26 @@ salt-master:
       - pkg: salt-minion
     - watch:
       - file: salt-minion
+
+configure-salt-master:
+  file.managed:
+    - name: /etc/salt/master
+    - source: salt://salt/templates/master.template
+    - template: jinja
+    - user: root
+    - groupt: root
+    - mode: 0700
+
+run-salt-master:
+  cmd.wait:
+    - name: start salt-master
+    - watch:
+      - file: run-salt-master
+    - require:
+      - file: configure-salt-master
+  file.managed:
+    - name: /etc/init/salt-master
+    - source: salt://salt/templates/upstart-master.conf
+    - template: jinja
+    - defaults:
+        run_mode: master