diff -Naur bin/apply-config /var/www/privml.ufsoft.org/bin/apply-config
--- bin/apply-config	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/apply-config	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: apply-config,v 1.15 2002/10/17 03:14:31 ehood Exp $
diff -Naur bin/compress-files /var/www/privml.ufsoft.org/bin/compress-files
--- bin/compress-files	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/compress-files	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: compress-files,v 1.8 2002/09/15 03:33:08 ehood Exp $
diff -Naur bin/compress-mboxes /var/www/privml.ufsoft.org/bin/compress-mboxes
--- bin/compress-mboxes	2006-02-19 21:07:35.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/compress-mboxes	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: compress-mboxes,v 1.8 2002/09/15 03:33:08 ehood Exp $
diff -Naur bin/config-check /var/www/privml.ufsoft.org/bin/config-check
--- bin/config-check	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/config-check	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: config-check,v 1.1 2002/09/20 02:56:31 ehood Exp $
diff -Naur bin/extract-mesg-date /var/www/privml.ufsoft.org/bin/extract-mesg-date
--- bin/extract-mesg-date	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/extract-mesg-date	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##      $Id: extract-mesg-date,v 1.4 2002/09/15 03:33:08 ehood Exp $
diff -Naur bin/filter-spool /var/www/privml.ufsoft.org/bin/filter-spool
--- bin/filter-spool	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/filter-spool	2006-02-19 22:36:47.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: filter-spool,v 1.11 2002/09/27 05:01:07 ehood Exp $
@@ -42,6 +42,7 @@
 use Getopt::Long;
 use MHArc::Util qw( cmd run_prg usage );
 
+
 my @_term_sigs  = qw(
     ABRT ALRM BUS FPE HUP ILL INT IOT PIPE POLL PROF QUIT SEGV
     TERM TRAP USR1 USR2 VTALRM XCPU XFSZ
@@ -71,6 +72,7 @@
     'mbox-dir=s',
     'procmailrc=s',
     'procmailvars=s',
+	'mbox=s',
 
     'help',
     'man',
@@ -84,6 +86,9 @@
     $MHArc::Util::ECHO_CMDS = 1;
   }
 
+  my $mbox		= $opt{'mbox'} ||
+  				$config->{'ORGMAIL'};
+
   my $home		= $opt{'home'} ||
 				$config->{'SW_ROOT'} ||
 				"$Dir/..";
diff -Naur bin/gc-search-indexes /var/www/privml.ufsoft.org/bin/gc-search-indexes
--- bin/gc-search-indexes	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/gc-search-indexes	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: gc-search-indexes,v 1.6 2002/09/15 03:33:08 ehood Exp $
diff -Naur bin/mbox-month-pack /var/www/privml.ufsoft.org/bin/mbox-month-pack
--- bin/mbox-month-pack	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/mbox-month-pack	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##      $Id: mbox-month-pack,v 1.4 2002/09/15 03:33:08 ehood Exp $
diff -Naur bin/mh-month-pack /var/www/privml.ufsoft.org/bin/mh-month-pack
--- bin/mh-month-pack	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/mh-month-pack	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##      $Id: mh-month-pack,v 1.5 2002/10/11 23:52:28 ehood Exp $
diff -Naur bin/mhonarc-check /var/www/privml.ufsoft.org/bin/mhonarc-check
--- bin/mhonarc-check	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/mhonarc-check	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
 ##---------------------------------------------------------------------------##
 ##  File:
 ##	$Id: mhonarc-check,v 1.6 2002/09/15 05:05:54 ehood Exp $
diff -Naur bin/mk-procmailrc /var/www/privml.ufsoft.org/bin/mk-procmailrc
--- bin/mk-procmailrc	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/mk-procmailrc	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: mk-procmailrc,v 1.25 2003/08/09 17:51:04 ehood Exp $
diff -Naur bin/read-mail /var/www/privml.ufsoft.org/bin/read-mail
--- bin/read-mail	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/read-mail	2006-02-19 22:36:36.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##--------------------------------------------------------------------------##
 ##  File:
 ##	$Id: read-mail,v 1.10 2002/09/15 03:33:08 ehood Exp $
@@ -49,6 +49,7 @@
     'force!',
     'home=s',
     'verbose!',
+	'mbox=s',
 
     'help',
     'man',
@@ -62,6 +63,9 @@
     $MHArc::Util::ECHO_CMDS = 1;
   }
 
+  my $mbox = $opt{'mbox'} ||
+  		$config->{'ORGMAIL'};
+
   my $home = $opt{'home'} ||
 		$config->{'SW_ROOT'} ||
 		"$Dir/..";
@@ -79,9 +83,12 @@
   }
 
   my @cmd_args = ();
+  my @cmd_args2 = ();
   push(@cmd_args, '-verbose')  if $verbose;
-  if (cmd('./bin/filter-spool', @cmd_args) == 0) {
-    cmd('./bin/web-archive', @cmd_args);
+  push(@cmd_args2, '-verbose')  if $verbose;
+  push(@cmd_args2, "-mail=$mbox") if $mbox;
+  if (cmd('./bin/filter-spool', @cmd_args2) == 0) {
+      cmd('./bin/web-archive', @cmd_args);
   }
 }
 
diff -Naur bin/read-maildir /var/www/privml.ufsoft.org/bin/read-maildir
--- bin/read-maildir	1970-01-01 01:00:00.000000000 +0100
+++ /var/www/privml.ufsoft.org/bin/read-maildir	2006-02-20 01:21:41.000000000 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Process messages in new
+source ./lib/config.sh
+mbox_temp="$(mktemp /tmp/mharc_tmp_mbox.XXXXXX)"
+echo "TMP MBOX: $mbox_temp"
+for mail in $(ls $ORGMAIL/new); do
+	cat $ORGMAIL/new/$mail | formail >> $mbox_temp
+	echo "Marking $mail as read..."
+	mv $ORGMAIL/new/$mail $ORGMAIL/cur/
+	echo "processed $mail"
+done
+	./bin/read-mail -mbox=$mbox_temp -verbose -force
+	echo -n "Removing $mbox_temp"
+	rm $mbox_temp
+	if [ $? == 0 ]; then
+		echo -e "\t Done"
+	else
+		echo -e "\t Failed"
+	fi
diff -Naur bin/web-archive /var/www/privml.ufsoft.org/bin/web-archive
--- bin/web-archive	2006-02-19 21:07:36.000000000 +0000
+++ /var/www/privml.ufsoft.org/bin/web-archive	2006-02-19 22:32:05.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ##---------------------------------------------------------------------------##
 ##  File:
 ##	$Id: web-archive,v 1.44 2003/08/09 17:56:05 ehood Exp $