Index: Slim/Buttons/Block.pm
===================================================================
--- Slim/Buttons/Block.pm	(revision 3527)
+++ Slim/Buttons/Block.pm	(working copy)
@@ -36,6 +36,7 @@
 	my $client = shift;
 	my $line1 = shift;
 	my $line2 = shift;
+	my $size = shift;
 	
 	# since we'll be doing an in-place replacement of the overlay, 
 	# we need to parse out the text, in case it's already been
@@ -43,7 +44,9 @@
 	$client->blocklines($client->parseLines([$line1,$line2]));
 
 	Slim::Buttons::Common::pushMode($client,'block');
-
+	$client->param('oldsize',$client->textSize());
+	$client->textSize($size) if (defined $size && $size >= 0 && $size < $client->maxTextSize());
+	
 	if (defined $line1) {
 		$client->showBriefly($line1, $line2);
 	}
@@ -66,6 +69,7 @@
 	Slim::Utils::Timers::killTimers($client, \&updateBlockedStatus);
 	Slim::Buttons::ScreenSaver::wakeup($client);
 	if (Slim::Buttons::Common::mode($client) eq 'block') {
+		$client->textSize($client->param('oldsize')) if defined $client->param('oldsize');
 		Slim::Buttons::Common::popMode($client);
 	}
 }
Index: Slim/Networking/Slimproto.pm
===================================================================
--- Slim/Networking/Slimproto.pm	(revision 3527)
+++ Slim/Networking/Slimproto.pm	(working copy)
@@ -344,8 +344,8 @@
 		
 		if ($client->needsUpgrade()) {
 			$client->brightness($client->maxBrightness());
-			$client->textSize(0);
-			Slim::Buttons::Block::block($client, string('PLAYER_NEEDS_UPGRADE_1'), string('PLAYER_NEEDS_UPGRADE_2'));
+			
+			Slim::Buttons::Block::block($client, string('PLAYER_NEEDS_UPGRADE_1'), string('PLAYER_NEEDS_UPGRADE_2'),0);
 		} else {
 			# workaround to handle multiple firmware versions causing blocking modes to stack
 			while (Slim::Buttons::Common::mode($client) eq 'block') {
Index: Slim/Player/Squeezebox.pm
===================================================================
--- Slim/Player/Squeezebox.pm	(revision 3527)
+++ Slim/Player/Squeezebox.pm	(working copy)
@@ -322,6 +322,7 @@
 	Slim::Utils::Prefs::clientSet($client, "powerOnBrightness", 4);
 	Slim::Utils::Prefs::clientSet($client, "powerOffBrightness", 1);
 	
+	my $oldsize = $client->textSize();
 	$client->textSize(0);
 	
 	# disable visualizer in this mode
@@ -370,6 +371,8 @@
 
 	$::d_firmware && msg("Firmware updated successfully.\n");
 	
+	$client->textSize($oldsize);
+
 #	Slim::Utils::Misc::blocking($client->tcpsock, 0);
 	
 	return undef;