diff --git a/roles/archwiki/handlers/main.yml b/roles/archwiki/handlers/main.yml
index 88ddedf18cd1ab774bd70636605931e0d3e19a2d..a84ec4253f4a5dea596ff1962081dd6f56fde980 100644
--- a/roles/archwiki/handlers/main.yml
+++ b/roles/archwiki/handlers/main.yml
@@ -6,6 +6,9 @@
   become: true
   become_user: "{{ archwiki_user }}"
 
+- name: Restart archwiki-runjobs-wait
+  service: name=archwiki-runjobs-wait state=restarted
+
 # The nginx proxy/fastcgi cache can be cleared by simply deleting all files in
 # the cache directory. It is important to keep the directory tree intact,
 # otherwise nginx will spit errors into the log until it is restarted (even
diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml
index bcf8377c9b4225bd1a50643346852347864d9daf..ae996ecbc2f46b00fbc47c3301898339b6ea0f29 100644
--- a/roles/archwiki/tasks/main.yml
+++ b/roles/archwiki/tasks/main.yml
@@ -56,6 +56,9 @@
   become_user: "{{ archwiki_user }}"
   notify:
     - Run wiki updatescript
+    # archwiki updates often break magic words in mails, leaving them
+    # unexpanded until the archwiki-runjobs-wait service is restarted
+    - Restart archwiki-runjobs-wait
     # purge the nginx cache and MediaWiki file cache to make sure clients get updated assets
     # as well as freshly rendered pages using the new assets
     - Purge nginx cache