diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index 6345a05817..8cd7974e62 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -101,6 +101,12 @@
   #notify:
   #  - restart mailman3
 
+# XXX: to remove when the RPM can be used
+- name: systemd service file for mailman3
+  template: src=mailman3.service.j2 dest=/etc/systemd/system/multi-user.target.wants/mailman3.service
+  tags:
+  - config
+
 
 #
 # Logging
@@ -276,6 +282,6 @@
   with_items:
   - httpd
   - postgresql
-  #- mailman3
+  - mailman3
   - postfix
   - memcached
diff --git a/roles/mailman/templates/mailman.cfg.j2 b/roles/mailman/templates/mailman.cfg.j2
index 21bb8ffa3b..4240a4a261 100644
--- a/roles/mailman/templates/mailman.cfg.j2
+++ b/roles/mailman/templates/mailman.cfg.j2
@@ -14,7 +14,7 @@ site_owner: root@localhost
 layout: dev
 
 [paths.dev]
-var_dir = /srv/webui/var
+var_dir = {{ mailman_webui_basedir }}/var
 
 [paths.fhs]
 bin_dir: /usr/libexec/mailman3
@@ -32,7 +32,7 @@ pid_file: /run/mailman3/master.pid
 [archiver.hyperkitty]
 class: mailman_hyperkitty.Archiver
 enable: yes
-configuration: /etc/mailman3.d/hyperkitty.cfg
+configuration: {{ mailman_webui_confdir }}/mailman-hyperkitty.cfg
 
 #[archiver.fedmsg]
 #class: mailman3_fedmsg_plugin.Archiver
diff --git a/roles/mailman/templates/mailman3.service.j2 b/roles/mailman/templates/mailman3.service.j2
new file mode 100644
index 0000000000..402cbb7cd2
--- /dev/null
+++ b/roles/mailman/templates/mailman3.service.j2
@@ -0,0 +1,15 @@
+[Unit]
+Description=GNU Mailing List Manager
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile={{ mailman_webui_basedir }}/var/master.pid
+User=mailman
+Group=mailman
+ExecStart={{ mailman_webui_basedir }}/venv-3.4/bin/mailman -C /etc/mailman.cfg start
+ExecReload={{ mailman_webui_basedir }}/venv-3.4/bin/mailman -C /etc/mailman.cfg restart
+ExecStop={{ mailman_webui_basedir }}/venv-3.4/bin/mailman -C /etc/mailman.cfg stop
+
+[Install]
+WantedBy=multi-user.target