diff --git a/roles/mailman/files/override.conf b/roles/mailman/files/override.conf
new file mode 100644
index 0000000000000000000000000000000000000000..8a764e3478830b4ffef3c88efded878d90e9b72a
--- /dev/null
+++ b/roles/mailman/files/override.conf
@@ -0,0 +1,2 @@
+[Service]
+Restart=always
diff --git a/roles/mailman/handlers/main.yml b/roles/mailman/handlers/main.yml
index b48bca38207f015f2eff329e552b6dfe8908210e..575fe778eaffe5841bc88c1f9e34a943f6db190a 100644
--- a/roles/mailman/handlers/main.yml
+++ b/roles/mailman/handlers/main.yml
@@ -1,4 +1,7 @@
 ---
+- name: restart mailman
+  service: name=mailman daemon_reload=yes state=restarted
+
 - name: reload mailman
   service: name=mailman state=reloaded
 
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index 79f7f2aa85237232322aef1a1aa1a8e5851023de..117048f99b87ea4256d33908bcdec1c1b016b2c2 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -48,6 +48,13 @@
 - name: start and enable postfix
   systemd: name=postfix.service enabled=yes daemon_reload=yes state=started
 
+- name: create drop-in directory for mailman.service
+  file: path=/etc/systemd/system/mailman.service.d state=directory owner=root group=root mode=0755
+
+- name: install drop-in for mailman.service
+  copy: src=override.conf dest=/etc/systemd/system/mailman.service.d/ owner=root group=root mode=0644
+  notify: restart mailman
+
 - name: start and enable mailman{.service,-*.timer}
   systemd: name={{ item }} enabled=yes daemon_reload=yes state=started
   loop: