diff --git a/roles/ispmail-packages/tasks/main.yml b/roles/ispmail-packages/tasks/main.yml
index 03f32be..94004e9 100644
--- a/roles/ispmail-packages/tasks/main.yml
+++ b/roles/ispmail-packages/tasks/main.yml
@@ -15,6 +15,8 @@
   - roundcube 
   - roundcube-plugins
   - phpmyadmin
+  - spamass-milter
+  - spamassassin
 - name: purge Exim installation
   apt: name={{item}} state=absent purge=yes
   with_items:
diff --git a/roles/ispmail-postfix/handlers/main.yml b/roles/ispmail-postfix/handlers/main.yml
index 2e4c95e..fd520ac 100644
--- a/roles/ispmail-postfix/handlers/main.yml
+++ b/roles/ispmail-postfix/handlers/main.yml
@@ -2,3 +2,6 @@
 - name: restart postfix
   service: name=postfix state=restarted
 
+- name: restart spamassassin
+  service: name=spamassassin state=restarted
+
diff --git a/roles/ispmail-postfix/tasks/main.yml b/roles/ispmail-postfix/tasks/main.yml
index 0a29d02..bd38344 100644
--- a/roles/ispmail-postfix/tasks/main.yml
+++ b/roles/ispmail-postfix/tasks/main.yml
@@ -66,4 +66,16 @@
 
 - name: Enabling SMTP authentication during the SMTP protocol
   shell: postconf smtpd_recipient_restrictions=permit_mynetworks,permit_sasl_authenticated,reject_unauth_destination
+- name: Enabling Spamassassin milter
+  command: postconf smtpd_milters=unix:/spamass/spamass.sock
+
+- name: Make Spamassassin milter problems return a temporary error
+  command: postconf milter_default_action=tempfail
+
+- name: Configuring Spamassassin milter
+  command: postconf milter_connect_macros="j {daemon_name} v {if_name} _"
+
+- name: Enabling spamd
+  copy: src=etc-default-spamassassin dest=/etc/default/spamassassin
+  notify: restart spamassassin