diff --git a/flavours/salt-master/10-salt-master b/flavours/salt-master/10-salt-master
new file mode 100755
index 00000000..a15e4afd
--- /dev/null
+++ b/flavours/salt-master/10-salt-master
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+apt-get -y install salt-master
+
diff --git a/flavours/salt-master/README.md b/flavours/salt-master/README.md
new file mode 100644
index 00000000..326b91f6
--- /dev/null
+++ b/flavours/salt-master/README.md
@@ -0,0 +1 @@
+Adds salt-master, a config-management tool, to the image.
diff --git a/flavours/salt/pre-install.d/10-salt b/flavours/salt-master/pre-install.d/10-salt-master
similarity index 100%
rename from flavours/salt/pre-install.d/10-salt
rename to flavours/salt-master/pre-install.d/10-salt-master
diff --git a/flavours/salt-minion/README.md b/flavours/salt-minion/README.md
new file mode 100644
index 00000000..14508ec2
--- /dev/null
+++ b/flavours/salt-minion/README.md
@@ -0,0 +1 @@
+Adds salt-minion, a config-management tool, to the image.
diff --git a/flavours/salt/install.d/10-salt b/flavours/salt-minion/install.d/10-salt-minion
similarity index 100%
rename from flavours/salt/install.d/10-salt
rename to flavours/salt-minion/install.d/10-salt-minion
diff --git a/flavours/salt-minion/pre-install.d/10-salt-minion b/flavours/salt-minion/pre-install.d/10-salt-minion
new file mode 100755
index 00000000..dd1389a7
--- /dev/null
+++ b/flavours/salt-minion/pre-install.d/10-salt-minion
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Add the salt PPA
+
+set -e
+set -o xtrace
+
+add-apt-repository -y ppa:saltstack/salt
+
diff --git a/flavours/salt/README.md b/flavours/salt/README.md
deleted file mode 100644
index 2f191bbe..00000000
--- a/flavours/salt/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Adds salt, a config-management tool, to the image.