diff --git a/PKGBUILD b/PKGBUILD
index 6dac7d3..99c6113 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,39 +4,39 @@
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=acpid
-pkgver=1.0.10
-pkgrel=3
+pkgver=2.0.5
+pkgrel=1
 pkgdesc="A daemon for delivering ACPI power management events"
 arch=('i686' 'x86_64')
-url="http://acpid.sourceforge.net"
+url="http://www.tedfelix.com/linux/acpid-netlink.html"
 license=('GPL')
-depends=(glibc)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+source=(http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz
     acpid
     acpid.conf.d
     anything
     handler.sh)
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
+md5sums=('796b99ca935e248c3be1f222a38f5ee1'
+    'd9ca7f71f520238a0448fab105a23fe9'
+    '91fdb3709c878eed757d192a420251a1'
+    '2d37b98d6e74bab815604b8b48c6cfd4'
+    '2d75561330a574db1b3f52c88f6be391')
+backup=('etc/acpi/handler.sh'
+    'etc/acpi/events/anything'
+    'etc/conf.d/acpid')
 
 build() {
+    set -e
     cd $srcdir/$pkgname-$pkgver
-    /usr/bin/make || return 1
-    /bin/install -d -m0755 $pkgdir/usr/bin || return 1
-    /usr/bin/make INSTPREFIX=$pkgdir \
-        MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1
+
+    make
+    make DESTDIR=$pkgdir install
 
     # install our supplementary scripts
-    /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1
-    /bin/install -D -m0644 $srcdir/acpid.conf.d $pkgdir/etc/conf.d/acpid || return 1
-    /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1
-    /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1
+    install -D -m0755 $srcdir/acpid         $pkgdir/etc/rc.d/acpid
+    install -D -m0644 $srcdir/acpid.conf.d  $pkgdir/etc/conf.d/acpid
+    install -D -m0644 $srcdir/anything      $pkgdir/etc/acpi/events/anything
+    install -D -m0755 $srcdir/handler.sh    $pkgdir/etc/acpi/handler.sh
 
     # set world readable bit on the acpid binary
-    /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1
+    chmod 755 $pkgdir/usr/sbin/acpid
 }
-
-md5sums=('61156ef32015c56dc0f2e3317f4ae09e'
-         'd9ca7f71f520238a0448fab105a23fe9'
-         '91fdb3709c878eed757d192a420251a1'
-         '2d37b98d6e74bab815604b8b48c6cfd4'
-         '0e8dd13793b1baa79a745f4034888367')
diff --git a/handler.sh b/handler.sh
index ad31d1a..1c79c0a 100644
--- a/handler.sh
+++ b/handler.sh
@@ -8,58 +8,104 @@ minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
 maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
 setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
 
-set $*
+set -- $*
 
 case "$1" in
     button/power)
-        #echo "PowerButton pressed!">/dev/tty5
         case "$2" in
-            PWRF)   logger "PowerButton pressed: $2" ;;
-            *)      logger "ACPI action undefined: $2" ;;
+            PBTN)
+                logger "ACPI: Power Button pressed"
+                #shutdown -h now
+                ;;
+            *)
+                logger "ACPI action undefined: $@"
+                ;;
         esac
         ;;
     button/sleep)
         case "$2" in
-            SLPB)   echo -n mem >/sys/power/state ;;
-            *)      logger "ACPI action undefined: $2" ;;
+            SBTN)
+                logger "ACPI: Sleep Button pressed"
+                #echo -n mem >/sys/power/state
+                ;;
+            *)
+                logger "ACPI action undefined: $@"
+                ;;
         esac
         ;;
     ac_adapter)
-        case "$2" in
-            AC)
+        case "$3" in
+            00000080)
                 case "$4" in
                     00000000)
-                        echo -n $minspeed >$setspeed
+                        logger "ACPI: on battery"
+                        #echo -n $minspeed >$setspeed
                         #/etc/laptop-mode/laptop-mode start
-                    ;;
+                        ;;
                     00000001)
-                        echo -n $maxspeed >$setspeed
+                        logger "ACPI: on AC"
+                        #echo -n $maxspeed >$setspeed
                         #/etc/laptop-mode/laptop-mode stop
-                    ;;
+                        ;;
                 esac
                 ;;
-            *)  logger "ACPI action undefined: $2" ;;
+            *)
+                logger "ACPI action undefined: $@"
+                ;;
         esac
         ;;
     battery)
-        case "$2" in
-            BAT0)
+        case "$3" in
+            00000080)
                 case "$4" in
-                    00000000)   #echo "offline" >/dev/tty5
-                    ;;
-                    00000001)   #echo "online"  >/dev/tty5
-                    ;;
+                    00000000)
+                        #echo "offline" >/dev/tty5
+                        ;;
+                    00000001)
+                        #echo "online"  >/dev/tty5
+                        ;;
                 esac
                 ;;
-            CPU0)	
+            *)
+                logger "ACPI action undefined: $@"
                 ;;
-            *)  logger "ACPI action undefined: $2" ;;
         esac
         ;;
     button/lid)
-        #echo "LID switched!">/dev/tty5
+        case "$3" in
+            open)
+                logger "ACPI: lid opened"
+                ;;
+            close)
+                logger "ACPI: lid closed"
+                ;;
+            *)
+                logger "ACPI action undefined: $@"
+                ;;
+        esac
+        ;;
+    button/volumedown)
+        logger "ACPI: volume down"
+        ;;
+    button/volumeup)
+        logger "ACPI: volume up"
+        ;;
+    video/brightnessdown)
+        logger "ACPI: brightness down"
+        ;;
+    video/brightnessup)
+        logger "ACPI: brightness up"
+        ;;
+    video/switchmode)
+        logger "ACPI: video switch mode"
+        ;;
+    button/mute)
+        logger "ACPI: mute"
+        ;;
+    processor)
+        logger "ACPI: $@"
         ;;
     *)
-        logger "ACPI group/action undefined: $1 / $2"
+        logger "ACPI group/action undefined: $@"
         ;;
 esac