diff -urN acpi-orig/events/panasonic-mute acpi/events/panasonic-mute
--- acpi-orig/events/panasonic-mute	1969-12-31 16:00:00.000000000 -0800
+++ acpi/events/panasonic-mute	2006-04-01 17:01:28.000000000 -0800
@@ -0,0 +1,3 @@
+# /etc/acpi/events/panasonic-brightness-up
+event=pcc HKEY 00000080 00000084
+action=/etc/acpi/mutebtn.sh
diff -urN acpi-orig/events/panasonic-volume-down acpi/events/panasonic-volume-down
--- acpi-orig/events/panasonic-volume-down	1969-12-31 16:00:00.000000000 -0800
+++ acpi/events/panasonic-volume-down	2006-04-01 16:03:32.000000000 -0800
@@ -0,0 +1,3 @@
+# /etc/acpi/events/panasonic-brightness-up
+event=pcc HKEY 00000080 00000085
+action=/etc/acpi/voldownbtn.sh
diff -urN acpi-orig/events/panasonic-volume-up acpi/events/panasonic-volume-up
--- acpi-orig/events/panasonic-volume-up	1969-12-31 16:00:00.000000000 -0800
+++ acpi/events/panasonic-volume-up	2006-04-01 16:02:37.000000000 -0800
@@ -0,0 +1,3 @@
+# /etc/acpi/events/panasonic-brightness-up
+event=pcc HKEY 00000080 00000086
+action=/etc/acpi/volupbtn.sh
diff -urN acpi-orig/panabright.sh acpi/panabright.sh
--- acpi-orig/panabright.sh	2006-04-01 17:02:26.000000000 -0800
+++ acpi/panabright.sh	2006-03-31 11:40:39.000000000 -0800
@@ -1,31 +1,29 @@
 #!/bin/sh
 
-SPAN=32
-
-grep -q off-line /proc/acpi/ac_adapter/*/state
-if [ $? = 0 ]
+STATE=`grep -c off-line /proc/acpi/ac_adapter/*/state`
+if [ "x$STATE" = "x0" ]
    then
-   INTERFACE="dc_brightness"
-else
    INTERFACE="ac_brightness"
+else
+   INTERFACE="dc_brightness"
 fi
 
-BRIGHTNESS=$(( `cat /proc/acpi/pcc/$INTERFACE` + 0 ))
-MAXBRIGHT=$(( `cat /proc/acpi/pcc/"$INTERFACE"_max` - $SPAN))
-MINBRIGHT=$(( `cat /proc/acpi/pcc/"$INTERFACE"_min` + $SPAN))
+BRIGHTNESS=$(( `cat /proc/acpi/pcc/$INTERFACE` ))
+MAXBRIGHT=$(( `cat /proc/acpi/pcc/"$INTERFACE"_max` ))
+MINBRIGHT=$(( `cat /proc/acpi/pcc/"$INTERFACE"_min` ))
 
 if [ "x$1" = "xdown" ]; then
    if [ $BRIGHTNESS -gt $MINBRIGHT ]; then
-      BRIGHTNESS=$(( $BRIGHTNESS - $SPAN ))
+      BRIGHTNESS=$(( $BRIGHTNESS - 1 ))
    else
-      BRIGHTNESS=$(( $MINBRIGHT - $SPAN ))
+      BRIGHTNESS=$(( $MINBRIGHT ))
    fi
    echo $BRIGHTNESS > /proc/acpi/pcc/$INTERFACE
 elif [ "x$1" = "xup" ]; then
    if [ $BRIGHTNESS -lt $MAXBRIGHT ]; then
-      BRIGHTNESS=$(( $BRIGHTNESS + $SPAN ))
+      BRIGHTNESS=$(( $BRIGHTNESS + 1 ))
    else
-      BRIGHTNESS=$(( $MAXBRIGHT + $SPAN ))
+      BRIGHTNESS=$(( $MAXBRIGHT ))
    fi
    echo $BRIGHTNESS > /proc/acpi/pcc/$INTERFACE
 else
diff -urN acpi-orig/panabright.sh.orig acpi/panabright.sh.orig
--- acpi-orig/panabright.sh.orig	1969-12-31 16:00:00.000000000 -0800
+++ acpi/panabright.sh.orig	2006-03-31 10:58:39.000000000 -0800
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+SPAN=32
+
+grep -q off-line /proc/acpi/ac_adapter/*/state
+if [ $? = 0 ]
+   then
+   INTERFACE="dc_brightness"
+else
+   INTERFACE="ac_brightness"
+fi
+
+BRIGHTNESS=$(( `cat /proc/acpi/pcc/$INTERFACE` + 0 ))
+MAXBRIGHT=$(( `cat /proc/acpi/pcc/"$INTERFACE"_max` - $SPAN))
+MINBRIGHT=$(( `cat /proc/acpi/pcc/"$INTERFACE"_min` + $SPAN))
+
+if [ "x$1" = "xdown" ]; then
+   if [ $BRIGHTNESS -gt $MINBRIGHT ]; then
+      BRIGHTNESS=$(( $BRIGHTNESS - $SPAN ))
+   else
+      BRIGHTNESS=$(( $MINBRIGHT - $SPAN ))
+   fi
+   echo $BRIGHTNESS > /proc/acpi/pcc/$INTERFACE
+elif [ "x$1" = "xup" ]; then
+   if [ $BRIGHTNESS -lt $MAXBRIGHT ]; then
+      BRIGHTNESS=$(( $BRIGHTNESS + $SPAN ))
+   else
+      BRIGHTNESS=$(( $MAXBRIGHT + $SPAN ))
+   fi
+   echo $BRIGHTNESS > /proc/acpi/pcc/$INTERFACE
+else
+   echo >&2 Unknown argument $1
+fi