diff --git a/map.jinja b/map.jinja
index 3667b54..53c395b 100644
--- a/map.jinja
+++ b/map.jinja
@@ -1,51 +1,53 @@
 {% set dirs = salt['grains.filter_by']({
     'Debian': {
         'etc': '/etc',
         'bin': '/usr/bin',
         'include': '/usr/include',
         'lib': '/usr/lib',
+        'man': '/usr/share/man',
     },
     'FreeBSD' : {
         'etc': '/usr/local/etc',
         'bin': '/usr/local/bin',
         'include': '/usr/local/include',
         'lib': '/usr/local/lib',
+        'man': '/usr/local/man',
     },
 }, default='Debian') %}
 
 {% set services = salt['grains.filter_by']({
     'Debian': {
         'manager': 'systemd',
     },
     'FreeBSD' : {
         'manager': 'rc',
     },
 }, default='Debian') %}
 
 {% set shells = salt['grains.filter_by']({
     'Debian': {
         'bash': '/bin/bash',
         'fish': '/usr/bin/fish',
         'tcsh': '/usr/bin/tcsh',
     },
     'FreeBSD' : {
         'bash': '/usr/local/bin/bash',
         'fish': '/usr/local/bin/fish',
         'tcsh': '/bin/tcsh',
     },
 }, default='Debian') %}
 
 {% set packages = salt['grains.filter_by']({
     'Debian' : {
         'sphinx': 'python3-sphinx',
     },
     'RedHat': {
         'sphinx': 'python3-sphinx',
     },
     'Arch': {
         'sphinx': 'python-sphinx',
     },
     'FreeBSD' : {
         'sphinx': 'py27-sphinx',
     },
 }, default='Debian') %}
diff --git a/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf b/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
new file mode 100644
index 0000000..d18d171
--- /dev/null
+++ b/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
@@ -0,0 +1,21 @@
+{
+    "comments": [
+        "This file is managed by our rOPS SaltStack repository.",
+
+        "Changes to this file may cause incorrect behavior",
+        "and will be lost if the state is redeployed.",
+
+        "Source file: roles/saltmaster/salt-wrapper/files/salt-wrapper.conf"
+    ],
+
+	"roots": [
+		{
+			"config": "/usr/local/etc/salt-woodscloud",
+			"states": "/opt/woodscloud-operations"
+		},
+		{
+			"config": "/usr/local/etc/salt",
+			"states": "/opt/nasqueron-operations"
+		}
+	]
+}
diff --git a/roles/saltmaster/salt-wrapper/init.sls b/roles/saltmaster/salt-wrapper/init.sls
new file mode 100644
index 0000000..520f63b
--- /dev/null
+++ b/roles/saltmaster/salt-wrapper/init.sls
@@ -0,0 +1,47 @@
+#   -------------------------------------------------------------
+#   Salt — Salt master configuration
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#   Project:        Nasqueron
+#   Created:        2017-10-04
+#   License:        Trivial work, not eligible to copyright
+#   -------------------------------------------------------------
+
+{% from "map.jinja" import dirs with context %}
+
+#   -------------------------------------------------------------
+#   Wrapper binaries
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.bin }}/salt-wrapper:
+  file.managed:
+    - source: salt://software/salt-wrapper/salt-wrapper.sh
+
+{{ dirs.bin }}/salt-get-config-dir:
+  file.managed:
+    - source: salt://software/salt-wrapper/salt-get-config-dir.py
+
+#   -------------------------------------------------------------
+#   Wrapper configuration
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.etc }}/salt-wrapper.conf:
+  file.managed:
+    - source: salt://roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
+
+#   -------------------------------------------------------------
+#   Wrapper manual
+#
+#   TODO: gzip those files
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.man }}/man1/salt-get-config-dir.1:
+  file.managed:
+    - source: salt://software/salt-wrapper/man/salt-get-config-dir.1
+
+{{ dirs.man }}/man1/salt-wrapper.1:
+  file.managed:
+    - source: salt://software/salt-wrapper/man/salt-wrapper.1
+
+{{ dirs.man }}/man5/salt-wrapper.conf.5:
+  file.managed:
+    - source: salt://software/salt-wrapper/man/salt-wrapper.conf.5
diff --git a/top.sls b/top.sls
index 97cc6ac..0065570 100644
--- a/top.sls
+++ b/top.sls
@@ -1,30 +1,31 @@
 #   -------------------------------------------------------------
 #   Salt configuration for Nasqueron servers
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Nasqueron
 #   Created:        2016-04-10
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
 base:
   '*':
     - roles/core/rc
     - roles/core/hostname
     - roles/core/network
     - roles/core/motd
     - roles/core/rsyslog
     - roles/core/salt
     - roles/core/sshd
     - roles/core/letsencrypt
   'local':
     - roles/saltmaster/sudo
+    - roles/saltmaster/salt-wrapper
   'dwellers.nasqueron.org':
     - roles/paas-docker/docker
     - roles/paas-lxc/lxc
   'eglide':
     - roles/shellserver/users
     - roles/shellserver/userland-software
     - roles/shellserver/eglide-website
     - roles/shellserver/vhosts
     - roles/shellserver/web-hosting
     - roles/shellserver/odderon