diff -Naur qmail-scanner-1.12/configure qmail-scanner-1.12-sa/configure
--- qmail-scanner-1.12/configure Thu May  9 17:16:05 2002
+++ qmail-scanner-1.12-sa/configure Wed May 29 10:58:39 2002
@@ -74,6 +74,7 @@
 DESCRIPTIVE_HEADERS="0"
 NOTIFY_ADDRESSES="sender,admin"
 USERNAME="$USER"
+SPAM_ADMIN=""
 MANUAL_INSTALL="0"
 INSTALLIT="0"
 
@@ -85,6 +86,7 @@
  --bindir) if [ "$2" != "" ] ; then  shift ; fi ; BINDIR="$1" ;;
  --user|--admin) if [ "$2" != "" ] ; then  shift ; fi ; USERNAME="$1" ;;
  --domain) if [ "$2" != "" ] ; then  shift ; fi ; MAILDOMAIN="$1" ;;
+ --spam-admin) if [ "$2" != "" ] ; then  shift ; fi ; SPAM_ADMIN="$1" ;;
  --notify) if [ "$2" != "" ]; then shift ; fi ; NOTIFY_ADDRESSES="$1" ;;
  --local-domains) if [ "$2" != "" ]; then shift ; fi ; LOCAL_DOMAINS_ARRAY="$1" ;;
  --lang) if [ "$2" != "" ]; then shift ; fi ; QSLANG="$1" ;;
@@ -109,6 +111,8 @@
   --admin <username> user to Email alerts to (default: $USERNAME)
   --domain <domain name> "user"@"domain" makes up Email address
  to Email alerts to.
+  --spam-admin <emailaddr> email address to where spam mail should be sent.
+         Defaults to no address meaning that spam will be sent through.
   --scanners <list of installed content scanners>
      Defaults to "auto" - will use
      whatever scanners are found on system.
@@ -303,6 +307,10 @@
 if [ "$INSTALLIT" = "1" ]; then
     CMDLINE="$CMDLINE --install $INSTALLIT"
 fi
+if [ "$SPAM_ADMIN" ]; then
+    TMPSTR="`echo $SPAM_ADMIN | sed 's/@/\\\\@/'`"
+    CMDLINE="$CMDLINE --spam-admin $TMPSTR"
+fi
 
 #echo "configure called as: $CMDLINE"
 
@@ -1104,6 +1112,9 @@
     echo "archiving into $AS_QQ/$ARCHIVEDIR/"
 fi
 echo "virus-admin=$USERNAME@$MAILDOMAIN"
+if [ "$SPAM_ADMIN" != "" ]; then
+    echo "spam-admin=$SPAM_ADMIN"
+fi
 echo "local-domains=$LOCAL_DOMAINS_ARRAY"
 echo "scanners=$SCANNER_ARRAY"
 
@@ -1137,6 +1148,11 @@
 fi
 
 
+if [ "$SPAM_ADMIN" != "" ]; then
+ SPAM_ADMIN="`echo $SPAM_ADMIN | sed 's/@/\\\\@/'`"
+fi
+
+
 #Gather info about OS this is been run on.
 
 HOST_OS=`uname -s`
@@ -1203,6 +1219,7 @@
 s?USERNAME?$USERNAME?g;
 s?FQDN?$FQDN?g;
 s?MAILDOMAIN?$MAILDOMAIN?g;
+s?SPAM_ADMIN?$SPAM_ADMIN?g;
 s?LOCAL_DOMAINS_ARRAY?$LOCAL_DOMAINS_ARRAY?g;
 s?NOTIFY_ADDRESSES?$NOTIFY_ADDRESSES?g;
 s?FIND?$FIND?g;
diff -Naur qmail-scanner-1.12/qmail-scanner-queue.template qmail-scanner-1.12-sa/qmail-scanner-queue.template
--- qmail-scanner-1.12/qmail-scanner-queue.template Mon May  6 00:36:42 2002
+++ qmail-scanner-1.12-sa/qmail-scanner-queue.template Thu May 30 23:17:38 2002
@@ -89,6 +89,9 @@
 # Address carbon-copied on any virus reports
 my $QUARANTINE_CC='USERNAME@MAILDOMAIN';
 
+# Address to where messages tagged as SPAM are sent
+my $SPAM_TO='SPAM_ADMIN';
+
 #Array of local domains that are checked against for
 #deciding whether or not to send recipient alerts to
 my @local_domains_array=(LOCAL_DOMAINS_ARRAY);
@@ -269,6 +272,7 @@
 chdir($scandir);
 umask(0077);
 my $quarantine_event=0;
+my $spam_event=0;
 
 my ($extra_file);
 
@@ -368,6 +372,9 @@
     &debug("unsetting TCPREMOTEIP env var");
     delete $ENV{'TCPREMOTEIP'};
     &email_quarantine_report;
+  } elsif ($spam_event && $SPAM_TO) {
+    &qmail_parent_check;
+    &qmail_requeue($env_returnpath,"T$SPAM_TO\0\0","$scandir/$wmaildir/new/$file_id");
   } else {
     &qmail_parent_check;
     &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); 
@@ -865,7 +872,6 @@
   &email_sender;
   &email_recips;
   &write_quarantine_report;
-  $elapsed_time = tv_interval ($start_time, [gettimeofday]);
   &debug("e_v_r: email_quarantine_report took ".tv_interval ($start_email_time, [gettimeofday])." seconds to execute");
 }
 
diff -Naur qmail-scanner-1.12/sub-spamassassin.pl qmail-scanner-1.12-sa/sub-spamassassin.pl
--- qmail-scanner-1.12/sub-spamassassin.pl Mon Mar 25 22:04:52 2002
+++ qmail-scanner-1.12-sa/sub-spamassassin.pl Wed May 29 11:25:46 2002
@@ -41,6 +41,7 @@
   } else {
     $tag_score .= "SA:1($sa_score/$sa_max):";
     $sa_comment = "Yes, hits=$sa_score required=$sa_max" if ($spamc_options =~ /\-c/);
+    $spam_event = 1;
   }
   
   $stop_spamassassin_time=[gettimeofday];