Index: lib/Mail/SpamAssassin/EvalTests.pm
===================================================================
--- lib/Mail/SpamAssassin/EvalTests.pm	(revision 9705)
+++ lib/Mail/SpamAssassin/EvalTests.pm	(working copy)
@@ -1929,13 +1929,13 @@
 
   my $text = '';
   for (my $i = 1; $i <= 9; $i++) {
-    $text .= lc($self->get("X-Habeas-SWE-$i"));
+    $text .= (lc($self->get("X-Habeas-SWE-$i")) || return 0);
   }
   if ($text) {
-    $text =~ s,\s+, ,g;
-    $text =~ s,^\s|\s$,,g;
-    $text =~ s,/?>,/>,;
-    $self->{habeas_swe} = sha1($text) eq q(76c65d9eb65e572166a08b50fd197b29af09d43a);
+    $text =~ s/\s+/ /g;
+    $text =~ s/^\s|\s$//g;
+    $text =~ s@/?>@/>@;
+    $self->{habeas_swe} = (sha1($text) eq '76c65d9eb65e572166a08b50fd197b29af09d43a');
   }
 
   return $self->{habeas_swe};
Index: rules/20_compensate.cf
===================================================================
--- rules/20_compensate.cf	(revision 9705)
+++ rules/20_compensate.cf	(working copy)
@@ -20,8 +20,6 @@
 require_version @@VERSION@@
 
 # support for Habeas sender-warranted email: http://www.habeas.com/
-header HABEAS_SWE               eval:message_is_habeas_swe()
-describe HABEAS_SWE             Has Habeas warrant mark (http://www.habeas.com/)
-tflags HABEAS_SWE               nice
+header __HABEAS_SWE	eval:message_is_habeas_swe()
 
 ###########################################################################
Index: rules/20_dnsbl_tests.cf
===================================================================
--- rules/20_dnsbl_tests.cf	(revision 9705)
+++ rules/20_dnsbl_tests.cf	(working copy)
@@ -169,10 +169,16 @@
 tflags DNS_FROM_RFCI_DSN	net
 
 # sa-hil.habeas.com for SpamAssassin queries
-# hil.habeas.com for everything else
-header HABEAS_VIOLATOR		eval:check_rbl_swe('hil', 'sa-hil.habeas.com.')
-describe HABEAS_VIOLATOR	Has Habeas warrant mark and on Infringer List
-tflags HABEAS_VIOLATOR		net
+# hil.habeas.com for other filters
+header HABEAS_INFRINGER		eval:check_rbl_swe('hil', 'sa-hil.habeas.com.')
+describe HABEAS_INFRINGER	Has Habeas warrant mark and on Infringer List
+tflags HABEAS_INFRINGER		net
+
+# sa-hul.habeas.com for SpamAssassin queries
+# hul.habeas.com for other filters
+header HABEAS_USER		eval:check_rbl_swe('hul', 'sa-hul.habeas.com.')
+describe HABEAS_USER		Has Habeas warrant mark and on User List
+tflags HABEAS_USER		net nice
 
 header RCVD_IN_BSP_TRUSTED	eval:check_rbl_txt('bsp-firsttrusted', 'sa-trusted.bondedsender.org.')
 describe RCVD_IN_BSP_TRUSTED	Sender is in Bonded Sender Program (trusted relay)
Index: rules/50_scores.cf
===================================================================
--- rules/50_scores.cf	(revision 9705)
+++ rules/50_scores.cf	(working copy)
@@ -1016,8 +1016,8 @@
 # Habeas: http://www.habeas.com/
 #
 
-score HABEAS_SWE -8.0
-score HABEAS_VIOLATOR 16.0
+score HABEAS_INFRINGER 0 8.0 0 8.0
+score HABEAS_USER 0 -8.0 0 -8.0
 
 #
 # Bayesian Classifier