diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList	2008-10-07 08:05:18.000000000 -0700
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/RBLList	2014-02-23 19:21:05.000000000 -0800
@@ -1 +1 @@
-bl.spamcop.net:combined.njabl.org:dnsbl.ahbl.org:dnsbl-1.uceprotect.net:dnsbl-2.uceprotect.net:list.dsbl.org:multihop.dsbl.org:psbl.surriel.com:zen.spamhaus.org
+bl.spamcop.net:dnsbl.ahbl.org:dnsbl-1.uceprotect.net:dnsbl-2.uceprotect.net:psbl.surriel.com:zen.spamhaus.org
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList	2008-10-07 08:05:18.000000000 -0700
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/SBLList	2014-02-23 19:21:51.000000000 -0800
@@ -1 +1 @@
-bogusmx.rfc-ignorant.org:multi.surbl.org:black.uribl.com:rhsbl.sorbs.net:bulk.rhs.mailpolice.com:fraud.rhs.mailpolice.com:porn.rhs.mailpolice.com:adult.rhs.mailpolice.com:ex.dnsbl.org
+multi.surbl.org:black.uribl.com:rhsbl.sorbs.net
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20ordb.org smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20ordb.org
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20ordb.org	2008-10-07 08:05:18.000000000 -0700
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20ordb.org	1969-12-31 16:00:00.000000000 -0800
@@ -1,8 +0,0 @@
-{
-    $qpsmtpd = $DB->get('qpsmtpd');
-    return unless $qpsmtpd;
-    return unless $qpsmtpd->prop('RBLList');
-
-    @rbl = grep { !/ordb.org$/ && !/ordb.net$/ } split /[,:]/, $qpsmtpd->prop('RBLList');
-    $qpsmtpd->set_prop('RBLList', join ':', @rbl);
-}
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20RBLList smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20RBLList
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20RBLList	1969-12-31 16:00:00.000000000 -0800
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20RBLList	2014-02-24 19:52:38.000000000 -0800
@@ -0,0 +1,15 @@
+{
+    $qpsmtpd = $DB->get('qpsmtpd');
+    return unless $qpsmtpd;
+    return unless $qpsmtpd->prop('RBLList');
+
+    my %obsolete = map { $_ => 1} qw(
+       combined.njabl.org
+       list.dsbl.org
+       multihop.dsbl.org
+    );
+
+    @rbl = grep { ! $obsolete{$_} } split /[,:]/, $qpsmtpd->prop('RBLList');
+    $qpsmtpd->set_prop('RBLList', join ':', @rbl);
+}
+
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20SBLLIST smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20SBLLIST
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20SBLLIST	1969-12-31 16:00:00.000000000 -0800
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20SBLLIST	2014-02-24 20:00:35.000000000 -0800
@@ -0,0 +1,18 @@
+{
+    $qpsmtpd = $DB->get('qpsmtpd');
+    return unless $qpsmtpd;
+    return unless $qpsmtpd->prop('SBLList');
+
+    my %obsolete = map { $_ => 1} qw(
+       blackhole.securitysage.com
+       bulk.rhs.mailpolice.com
+       fraud.rhs.mailpolice.com
+       porn.rhs.mailpolice.com
+       adult.rhs.mailpolice.com
+       bogusmx.rfc-ignorant.org
+       ex.dnsbl.org
+    );
+
+    @sbl = grep { !$obsolete{$_} } split /[,:]/, $qpsmtpd->prop('SBLList');
+    $qpsmtpd->set_prop('SBLList', join ':', @sbl);
+}
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20securitysage smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20securitysage
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20securitysage	2008-10-07 08:05:18.000000000 -0700
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20securitysage	1969-12-31 16:00:00.000000000 -0800
@@ -1,8 +0,0 @@
-{
-    $qpsmtpd = $DB->get('qpsmtpd');
-    return unless $qpsmtpd;
-    return unless $qpsmtpd->prop('SBLList');
-
-    @sbl = grep { !/blackhole.securitysage.com$/ } split /[,:]/, $qpsmtpd->prop('SBLList');
-    $qpsmtpd->set_prop('SBLList', join ':', @sbl);
-}
diff -ruN smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20spamhaus smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20spamhaus
--- smeserver-qpsmtpd-2.2.0.old/root/etc/e-smith/db/configuration/migrate/20spamhaus	2008-10-07 08:05:18.000000000 -0700
+++ smeserver-qpsmtpd-2.2.0/root/etc/e-smith/db/configuration/migrate/20spamhaus	1969-12-31 16:00:00.000000000 -0800
@@ -1,12 +0,0 @@
-{
-    $qpsmtpd = $DB->get('qpsmtpd');
-    return unless $qpsmtpd;
-    return unless $qpsmtpd->prop('RBLList');
-
-    @rbl = split /[,:]/, $qpsmtpd->prop('RBLList');
-    if ( grep { /^sbl-xbl.spamhaus.org$/ } @rbl ) {
-        @rbl = grep { !/^sbl-xbl.spamhaus.org$/ } @rbl;
-        push @rbl, 'zen.spamhaus.org';
-        $qpsmtpd->set_prop('RBLList', join ':', @rbl);
-    }
-}