--- Common.pm	2005-09-29 01:20:00.000000000 -0700
+++ Slim/Buttons/Common.pm	2005-10-03 13:55:28.465434300 -0700
@@ -335,9 +335,17 @@ our %functions = (
 		
 		if ($client->power()) {
 			$brightmode = 'powerOnBrightness';
+			
 			if ($mode eq $client->prefGet('screensaver') ||
-					$mode eq $client->prefGet('idlesaver')) {
+					$mode eq $client->prefGet('idlesaver') || 
+						($client->prefGet('autobrightness') &&
+							Slim::Hardware::IR::lastIRTime($client) &&
+							Slim::Hardware::IR::lastIRTime($client) < Time::HiRes::time() - $client->prefGet("screensavertimeout")
+						)
+					) {
+						
 				$brightmode = 'idleBrightness';
+			
 			}
 		} else {
 			$brightmode = 'powerOffBrightness';
--- IR.pm	2005-08-31 19:17:00.000000000 -0700
+++ Slim/Hardware/IR.pm	2005-10-03 13:57:09.840434300 -0700
@@ -641,7 +641,7 @@ sub executeButton {
 	
 	$::d_ir && msg("trying to execute button: $irCode\n");
 
-	if ($irCode ne "0" || !defined $time) {
+	if ($irCode !~ "brightness" && $irCode ne "dead" && ($irCode ne "0" || !defined $time)) {
 		setLastIRTime($client, Time::HiRes::time());
 	}
 
--- ScreenSaver.pm	2005-09-10 03:03:00.000000000 -0700
+++ Slim/Buttons/ScreenSaver.pm	2005-10-03 13:55:10.387309300 -0700
@@ -138,7 +138,7 @@ sub wakeup {
 	my $client = shift;
 	my $button = shift;
 	
-	return if ($button && $button =~ "brightness");
+	return if ($button && ($button =~ "brightness" || $button eq "dead"));
 	
 	Slim::Hardware::IR::setLastIRTime($client, Time::HiRes::time());