diff --git a/pillar/id/pinot_infra_opensuse_org.sls b/pillar/id/pinot_infra_opensuse_org.sls
index 2a8f7b4..e7ceeae 100644
--- a/pillar/id/pinot_infra_opensuse_org.sls
+++ b/pillar/id/pinot_infra_opensuse_org.sls
@@ -5,6 +5,7 @@ grains:
     - countdown.o.o
   roles:
     - countdown
+    - mail_reminder
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
diff --git a/pillar/role/mail_reminder.sls b/pillar/role/mail_reminder.sls
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/pillar/role/mail_reminder.sls
@@ -0,0 +1 @@
+#
diff --git a/salt/profile/mail_reminder/init.sls b/salt/profile/mail_reminder/init.sls
new file mode 100644
index 0000000..1043194
--- /dev/null
+++ b/salt/profile/mail_reminder/init.sls
@@ -0,0 +1,42 @@
+mail_reminder_pkgs:
+  pkg.installed:
+    - pkgs:
+      - git-core
+      - python-base
+
+mail_reminder:
+    user.present:
+    - createhome: False
+    - home: /home/mail_reminder
+    - shell: /bin/bash
+
+/home/mail_reminder:
+  file.directory:
+    - user: mail_reminder
+
+https://github.com/openSUSE/mail-reminder:
+  # salt 2018.3.3 introduced git.cloned - switch once our salt is new enough
+  git.latest:
+    - target: /home/mail_reminder/git
+    - user: mail_reminder
+
+
+mail_reminder_cron_mailto:
+  cron.env_present:
+    - name: MAILTO
+    - value: admin-auto@opensuse.org
+    - user: mail_reminder
+
+'cd /home/mail_reminder/git/ && git pull -q':
+  cron.present:
+    - identifier: git_pull
+    - user: mail_reminder
+    - minute: 40
+    - hour: 0
+
+'/home/mail_reminder/git/mail-reminder --no-debug':
+  cron.present:
+    - identifier: mailer
+    - user: mail_reminder
+    - minute: 42
+    - hour: 0
diff --git a/salt/role/mail_reminder.sls b/salt/role/mail_reminder.sls
new file mode 100644
index 0000000..2a4ce1c
--- /dev/null
+++ b/salt/role/mail_reminder.sls
@@ -0,0 +1,2 @@
+include:
+  - profile.mail_reminder