diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..461fdb1
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart nullmailer
+  service: name=nullmailer state=restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 96fe048..a781495 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,4 @@
-- name: install ssmtp
-  apt: pkg=ssmtp state=latest
-- name: setup ssmtp
-  template:
-    src: smtp.conf.j2
-    dest: /etc/ssmtp/ssmtp.conf
+- include_tasks: ssmtp.yml
+  when: ansible_distribution_release == "stretch"
+- include_tasks: nullmailer.yml
+  when: ansible_distribution_release != "stretch"
diff --git a/tasks/nullmailer.yml b/tasks/nullmailer.yml
new file mode 100644
index 0000000..25988bb
--- /dev/null
+++ b/tasks/nullmailer.yml
@@ -0,0 +1,12 @@
+- name: install nullmailer
+  apt: pkg=nullmailer state=latest
+
+- name: setup nullmailer
+  notify: restart nullmailer
+  copy:
+    dest: "{{ item.dest }}"
+    content: "{{ mail.root }}"
+  with_items:
+  - {"dest": "/etc/nullmailer/adminaddr",     content: "{{ mail.root }}"}
+  - {"dest": "/etc/nullmailer/remotes",       content: "{{ mail.root }}"}
+  - {"dest": "/etc/nullmailer/defaultdomain", content: "{{ mail.domain }}"}
diff --git a/tasks/ssmtp.yml b/tasks/ssmtp.yml
new file mode 100644
index 0000000..4fcfa9a
--- /dev/null
+++ b/tasks/ssmtp.yml
@@ -0,0 +1,7 @@
+- name: install ssmtp
+  apt: pkg=ssmtp state=latest
+
+- name: setup ssmtp
+  template:
+    src: smtp.conf.j2
+    dest: /etc/ssmtp/ssmtp.conf