diff --git a/base.yml b/base.yml
index b99b2b71..4e7099a9 100755
--- a/base.yml
+++ b/base.yml
@@ -67,7 +67,10 @@
 - import_playbook: plays/mail.yml
 - import_playbook: plays/nfs.yml
 - import_playbook: plays/logs.yml
-- import_playbook: plays/tv.yml
 - import_playbook: plays/backup.yml
 - import_playbook: plays/network-interfaces.yml
 - import_playbook: plays/monitoring.yml
+
+# Services that only apply to a subset of server
+- import_playbook: plays/tv.yml
+- import_playbook: plays/mailman.yml
diff --git a/mailman.yml b/plays/mailman.yml
similarity index 97%
rename from mailman.yml
rename to plays/mailman.yml
index 2ce0e772..0a51655e 100755
--- a/mailman.yml
+++ b/plays/mailman.yml
@@ -1,6 +1,6 @@
 #!/usr/bin/env ansible-playbook
-# Mailman playbook
 ---
+# Deploy Mailman
 - hosts: redisdead.adm.crans.org
   vars:
     mailman: