diff -aur apcupsd.old/apcupsd.conf apcupsd/apcupsd.conf
--- apcupsd.old/apcupsd.conf	Wed Sep 11 03:27:09 2002
+++ apcupsd/apcupsd.conf	Tue Sep 10 17:03:03 2002
@@ -16,7 +16,7 @@
 #            940-15(24C) |
 #            ether, usb ]
 # defines the type of cable that you have.
-UPSCABLE smart
+UPSCABLE usb
 #
 # UPSTYPE [ backups | sharebasic | netups |
 #           backupspro | smartvsups |
@@ -26,7 +26,7 @@
 # *** NEW TYPES FOR GENERIC DRIVERS ***
 # UPSTYPE [ dumb | apcsmart | net | usb | snmp ]
 # defines the type of UPS you have.
-UPSTYPE smartups
+UPSTYPE usb
 #
 #
 #DEVICE <string> /dev/<serial port>
@@ -44,11 +44,11 @@
 #                                    the UPS device: can be "APC" or "RFC"
 #                                    where APC is the powernet MIB and RFC
 #                                    is the IETF's standardized UPS-MIB.
-DEVICE /dev/ttyS0
+DEVICE /dev/usb/hid/hiddev[0-9]
 #
 #LOCKFILE <path to lockfile>
 # path for serial port lock file
-LOCKFILE /var/lock
+LOCKFILE /var/lock/subsys
 #
 #
 #
diff -aur apcupsd.old/changeme apcupsd/changeme
--- apcupsd.old/changeme	Wed Sep 11 03:27:09 2002
+++ apcupsd/changeme	Wed Sep 11 03:32:46 2002
@@ -12,8 +12,10 @@
 MSG="$HOSTNAME UPS battery needs changing NOW."
 #
 (
+   echo "Subject: $MSG"
+   echo " "
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $MAIL -s "$MSG" $SYSADMIN
+) | $MAIL $SYSADMIN
 exit 0
diff -aur apcupsd.old/commfailure apcupsd/commfailure
--- apcupsd.old/commfailure	Wed Sep 11 03:27:09 2002
+++ apcupsd/commfailure	Wed Sep 11 03:34:02 2002
@@ -12,8 +12,10 @@
 MSG="$HOSTNAME Serial port communications with UPS lost"
 #
 (
+   echo "Subject: $MSG"
+   echo " "
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $MAIL -s "$MSG" $SYSADMIN
+) | $MAIL $SYSADMIN
 exit 0
diff -aur apcupsd.old/commok apcupsd/commok
--- apcupsd.old/commok	Wed Sep 11 03:27:09 2002
+++ apcupsd/commok	Wed Sep 11 03:34:36 2002
@@ -12,8 +12,10 @@
 MSG="$HOSTNAME Serial port communications with UPS restored"
 #
 (
+   echo "Subject: $MSG"
+   echo " "
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $MAIL -s "$MSG" $SYSADMIN
+) | $MAIL $SYSADMIN
 exit 0
diff -aur apcupsd.old/mainsback apcupsd/mainsback
--- apcupsd.old/mainsback	Wed Sep 11 03:27:09 2002
+++ apcupsd/mainsback	Wed Sep 11 03:34:57 2002
@@ -12,8 +12,10 @@
 MSG="$HOSTNAME Power has returned"
 #
 (
+   echo "Subject: $MSG"
+   echo " "
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $MAIL -s "$MSG" $SYSADMIN
+) | $MAIL $SYSADMIN
 exit 0
diff -aur apcupsd.old/masterconnect apcupsd/masterconnect
--- apcupsd.old/masterconnect	Wed Sep 11 03:27:09 2002
+++ apcupsd/masterconnect	Wed Sep 11 03:35:45 2002
@@ -12,8 +12,10 @@
 MSG="slave $HOSTNAME received connection from master"
 #
 (
+   echo "Subject: $MSG"
+   echo " "
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $MAIL -s "$MSG" $SYSADMIN
+) | $MAIL $SYSADMIN
 exit 0
diff -aur apcupsd.old/mastertimeout apcupsd/mastertimeout
--- apcupsd.old/mastertimeout	Wed Sep 11 03:27:09 2002
+++ apcupsd/mastertimeout	Wed Sep 11 03:36:06 2002
@@ -12,8 +12,10 @@
 MSG="slave $HOSTNAME lost contact with master"
 #
 (
+   echo "Subject: $MSG"
+   echo " "
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $MAIL -s "$MSG" $SYSADMIN
+) | $MAIL $SYSADMIN
 exit 0
diff -aur apcupsd.old/onbattery apcupsd/onbattery
--- apcupsd.old/onbattery	Wed Sep 11 03:27:09 2002
+++ apcupsd/onbattery	Tue Sep 10 20:38:15 2002
@@ -12,8 +12,10 @@
 MSG="$HOSTNAME Power Failure !!!"
 #
 (
+   echo "Subject: $MSG"
+   echo " "
    echo "$MSG"
    echo " "
    /usr/sbin/apcaccess status
-) | $MAIL -s "$MSG" $SYSADMIN
+) | $MAIL $SYSADMIN
 exit 0