--- a/src/context.cpp	Mon Mar 06 18:44:14 2017 -0800
+++ b/src/context.cpp	Tue Mar 07 09:39:25 2017 -0800
@@ -1204,6 +1204,13 @@
                 return token_black;
             }
         }
+        if (st == token_signed_white) {
+            // not signed by a white signer, but maybe passes strong spf check
+            if (resolve_spf(from, priv->ip, priv)) {
+                log(queueid, "spf pass for %s rather than whitelisted dkim signer", from);
+                return token_white;
+            }
+        }
         if (st == token_require_signed) {
             // not signed by a required signer, but maybe passes strong spf check
             // only check spf if the list of required signers is not a single blank.