diff --git a/modules/ocf_mail/files/spam/postgrey/postgrey b/modules/ocf_mail/files/spam/postgrey/postgrey
deleted file mode 100644
index 278080b4c..000000000
--- a/modules/ocf_mail/files/spam/postgrey/postgrey
+++ /dev/null
@@ -1,12 +0,0 @@
-# postgrey startup options, created for Debian
-
-# you may want to set
-#   --delay=N   how long to greylist, seconds (default: 300)
-#   --max-age=N delete old entries after N days (default: 35)
-# see also the postgrey(8) manpage
-
-POSTGREY_OPTS="--inet=10023 --delay=3600"
-
-# the --greylist-text commandline argument can not be easily passed through
-# POSTGREY_OPTS when it contains spaces.  So, insert your text here:
-POSTGREY_TEXT="Wait and try later"
diff --git a/modules/ocf_mail/manifests/spam.pp b/modules/ocf_mail/manifests/spam.pp
index ab285d920..5f17ca58c 100644
--- a/modules/ocf_mail/manifests/spam.pp
+++ b/modules/ocf_mail/manifests/spam.pp
@@ -4,7 +4,6 @@
 #  - milter configuration
 #  - clamav virus scanning
 #  - spamassassin
-#  - postgrey (graylisting)
 #  - policyd-weight (DNSBLs and more)
 #  - basic metadata logging to /var/log/ocfmail.log
 #
@@ -14,7 +13,7 @@
   # badness filtering common to all site configurations
 
   package {
-    ['clamav-milter', 'spamassassin', 'spamass-milter', 'postgrey',
+    ['clamav-milter', 'spamassassin', 'spamass-milter',
     'policyd-weight']:;
   }
 
@@ -26,8 +25,6 @@
       require => Package['spamass-milter'];
     'clamav-milter':
       require => Package['clamav-milter'];
-    'postgrey':
-      require => Package['postgrey'];
     'policyd-weight':
       require => Package['policyd-weight'];
   }
@@ -78,10 +75,6 @@
       source  => 'puppet:///modules/ocf_mail/spam/clamav/clamav-milter.conf',
       notify  => Service['clamav-milter'],
       require => Package['clamav-milter'];
-    '/etc/default/postgrey':
-      source  => 'puppet:///modules/ocf_mail/spam/postgrey/postgrey',
-      notify  => Service['postgrey'],
-      require => Package['postgrey'];
     '/etc/policyd-weight.conf':
       source  => 'puppet:///modules/ocf_mail/spam/policyd-weight/policyd-weight.conf',
       notify  => Service['policyd-weight'],
diff --git a/modules/ocf_mail/templates/postfix/main.cf.erb b/modules/ocf_mail/templates/postfix/main.cf.erb
index 36f2bc7a4..900c6c04f 100644
--- a/modules/ocf_mail/templates/postfix/main.cf.erb
+++ b/modules/ocf_mail/templates/postfix/main.cf.erb
@@ -99,13 +99,12 @@ recipient_delimiter = +
 propagate_unmatched_extensions = canonical
 
 # client restrictions for SMTP connections
-# skip OCF, reject if no reverse DNS, greylist if not whitelisted
+# skip OCF, reject if no reverse DNS
 smtpd_client_restrictions =
     permit_mynetworks,
     permit_sasl_authenticated,
     reject_unknown_client_hostname,
     permit_dnswl_client list.dnswl.org,
-    check_policy_service inet:127.0.0.1:10023,
     sleep 5,
     permit,