diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -48,6 +48,7 @@
         'sphinx': 'python3-sphinx',
         'tcltls': 'tcl-tls',
         'varnish': 'varnish',
+        'verbiste': 'verbiste',
     },
     'RedHat': {
         'ag': 'the_silver_searcher',
@@ -81,5 +82,6 @@
         'sphinx': 'py27-sphinx',
         'tcltls': 'tcltls',
         'varnish': 'varnish5',
+        'verbiste': 'fr-verbiste',
     },
 }, default='Debian') %}
diff --git a/roles/devserver/init.sls b/roles/devserver/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/devserver/init.sls
@@ -0,0 +1,10 @@
+#   -------------------------------------------------------------
+#   Salt — Provision a development server
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#   Project:        Nasqueron
+#   Created:        2017-10-20
+#   License:        Trivial work, not eligible to copyright
+#   -------------------------------------------------------------
+
+include:
+  - .userland-software
diff --git a/roles/shellserver/userland-software/web.sls b/roles/devserver/userland-software/dev.sls
copy from roles/shellserver/userland-software/web.sls
copy to roles/devserver/userland-software/dev.sls
--- a/roles/shellserver/userland-software/web.sls
+++ b/roles/devserver/userland-software/dev.sls
@@ -1,25 +1,19 @@
 #   -------------------------------------------------------------
-#   Salt — Provision web software
+#   Salt — Provision dev software
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#   Project:        Eglide
-#   Created:        2016-06-12
+#   Project:        Nasqueron
+#   Created:        2017-10-20
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
-#   -------------------------------------------------------------
-#   nginx
-#   -------------------------------------------------------------
-
-nginx:
-  pkg.installed: []
-  service.running:
-    - require:
-      - pkg: nginx
+{% from "map.jinja" import packages with context %}
 
 #   -------------------------------------------------------------
-#   SSL certificates
+#   Rust
 #   -------------------------------------------------------------
 
-letsencrypt:
-  pkg.installed:
-    - name: letsencrypt
+devserver_software_dev_rust:
+  pkg:
+    - installed
+    - pkgs:
+      - rust
diff --git a/roles/devserver/userland-software/init.sls b/roles/devserver/userland-software/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/devserver/userland-software/init.sls
@@ -0,0 +1,15 @@
+#   -------------------------------------------------------------
+#   Salt — Provision software
+#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#   Project:        Nasqueron
+#   Created:        2017-10-20
+#   License:        Trivial work, not eligible to copyright
+#   -------------------------------------------------------------
+
+include:
+  # Shell server content
+  - roles/shellserver/userland-software/base
+  - roles/shellserver/userland-software/irc
+  - roles/shellserver/userland-software/web
+  # Software specific for development servers
+  - .dev
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -18,8 +18,10 @@
     - pkgs:
       - bash
       - fish
-      - tcsh
       - zsh
+      {% if grains['os'] != 'FreeBSD' %}
+      - tcsh
+      {% endif %}
 
 #   -------------------------------------------------------------
 #   Editors
@@ -50,6 +52,7 @@
       - figlet
       - nmap
       - toilet
+      - tmux
       - tree
       - whois
       - woof
@@ -63,6 +66,9 @@
       {% if grains['os'] == 'FreeBSD' %}
       - figlet-fonts
       - bind-tools
+      - sudo
+      - coreutils
+      - wget
       {% endif %}
 
 #   -------------------------------------------------------------
@@ -76,9 +82,7 @@
       - autoconf
       - automake
       - git
-      - arcanist
       - colordiff
-      - strace
       - cmake
       - valgrind
       - {{ packages.cppunit }}
@@ -87,17 +91,19 @@
       - php7.1-curl
       {% endif %}
       {% if grains['os'] != 'FreeBSD' %}
+      - arcanist
       - clang
       - llvm
+      - strace
       {% endif %}
 
+{% if grains['os_family'] == 'Debian' %}
 dev_popular_libs:
   pkg:
     - installed
     - pkgs:
-      {% if grains['os_family'] == 'Debian' %}
       - libssl-dev
-      {% endif %}
+{% endif %}
 
 #   -------------------------------------------------------------
 #   Languages
@@ -145,5 +151,5 @@
   pkg:
     - installed
     - pkgs:
-        - verbiste
+        - {{ packages['verbiste'] }}
         - {{ packages['aspell-fr'] }}
diff --git a/roles/shellserver/userland-software/web.sls b/roles/shellserver/userland-software/web.sls
--- a/roles/shellserver/userland-software/web.sls
+++ b/roles/shellserver/userland-software/web.sls
@@ -6,6 +6,8 @@
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
+{% from "map.jinja" import packages with context %}
+
 #   -------------------------------------------------------------
 #   nginx
 #   -------------------------------------------------------------
@@ -22,4 +24,4 @@
 
 letsencrypt:
   pkg.installed:
-    - name: letsencrypt
+    - name: {{ packages.certbot }}