--- src/acl.c.orig      2007-02-06 22:28:10.000000000 +0000
+++ src/acl.c   2007-02-07 09:46:10.000000000 +0000
@@ -503,7 +503,7 @@

   #ifdef EXPERIMENTAL_SPF
   (1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)|      /* spf */
-    (1<<ACL_WHERE_HELO)|
+/*    (1<<ACL_WHERE_HELO)| */
     (1<<ACL_WHERE_MAILAUTH)|
     (1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
     (1<<ACL_WHERE_STARTTLS)|(1<<ACL_WHERE_VRFY)|
@@ -3011,7 +3011,8 @@

     #ifdef EXPERIMENTAL_SPF
     case ACLC_SPF:
-      rc = spf_process(&arg, sender_address);
+       rc = ((where == ACL_WHERE_HELO)? spf_process(&arg, sender_helo_name)
+               : spf_process(&arg, sender_address));
     break;
     #endif