--- a/xml/dnsbl.in	Wed Dec 11 22:57:06 2013 -0800
+++ b/xml/dnsbl.in	Tue Dec 17 15:35:23 2013 -0800
@@ -612,6 +612,10 @@
                 http:// protocol header. Such references are still clickable in common
                 mail software.
             </para>
+            <para>
+                Add trusted_spf list of domains for which we trust their spf data. Mail
+                from their listed ip addresses from their domain will be whitelisted.
+            </para>
         </refsect1>
 
         <refsect1 id='copyright.1'>
@@ -734,11 +738,14 @@
 FROM-ADDR  = ADDRESS VALUE [";"]
 DCC-FROM   = "dcc_from" "{" DCCINCLUDEFILE "}" ";"
 
-RATE-LIMIT     = "rate_limit" [DEFAULT_LIMIT [DAILY_MULTIPLE]] "{" (RATE)+ "}"
-RATE           = USER LIMIT [";"]
-LIMIT          = INTEGER
-DEFAULT_LIMIT  = INTEGER
-DAILY_MULTIPLE = INTEGER
+RATE-LIMIT     = "rate_limit" DEFAULT_RCPT_LIMIT DAILY_MULTIPLE_RCPT
+                              DEFAULT_IP_LIMIT   DAILY_MULTIPLE_IP "{" (RATE)+ "}"
+RATE           = USER RCPTLIMIT IPLIMIT ";"
+RCPTLIMIT      = INTEGER
+DEFAULT_RCPT_LIMIT  = INTEGER
+DAILY_MULTIPLE_RCPT = INTEGER
+DEFAULT_IP_LIMIT    = INTEGER
+DAILY_MULTIPLE_IP   = INTEGER
 
 DEFAULT    = ("white" | "black" | "unknown" | "inherit" | "")
 ADDRESS    = (USER@ | DOMAIN | USER@DOMAIN)
@@ -772,21 +779,23 @@
         dcc_bulk_threshold  50;
     };
 
-    // backscatter prevention - don't send bounces for mail that we accepted but could not forward
+    // backscatter prevention - do not send bounces for mail that we accepted but could not forward
     // we only send bounces to our own customers
     env_from unknown {
         "<>"    black;
     };
 
-    // hourly recipient rate limit by smtp auth client id,
-    // or unauthenticated mail from address
-    // default hourly limit is 30
-    // daily limits are 4 times the hourly limit
-    rate_limit 30 4 { // default
-        #fred 100;   // override default limits
-        #joe  10;    // ""
-        #"sam@somedomain.tld"  500;
-        #"@otherdomain.tld"    100;
+    // hourly recipient rate limit by smtp auth client id, or unauthenticated mail from address
+    // hourly unique ip addresses  by smtp auth client id, or unauthenticated mail from address
+    // default hourly rate limit is 30
+    // daily rate limits are 4 times the hourly limit
+    // default hourly unique ip addresses is 5
+    // daily unique ip addresses are 4 times the hourly limit
+    rate_limit 30 4 5 4 { // default
+        fred 100 10;   // override default limits
+        joe  10  2;    // ""
+        "sam@somedomain.tld"  500 2;
+        "@otherdomain.tld"    100 2;
     };
 };