Index: Slim/Web/Pages/Playlist.pm
===================================================================
--- Slim/Web/Pages/Playlist.pm	(revision 11801)
+++ Slim/Web/Pages/Playlist.pm	(working copy)
@@ -124,10 +124,11 @@
 	my %form;
 
 	$params->{'cansave'} = 1;
+	$params->{'currentItem'} = Slim::Player::Source::playingSongIndex($client);
 	
 	$params->{'pageinfo'} = Slim::Web::Pages->pageInfo({
 				'itemCount'    => $songcount,
-				'currentItem'  => Slim::Player::Source::playingSongIndex($client),
+				'currentItem'  => $params->{'currentItem'},
 				'path'         => $params->{'path'},
 				'otherParams'  => "player=" . Slim::Utils::Misc::escape($client->id()),
 				'start'        => $params->{'start'},
@@ -177,7 +178,7 @@
 		$form{'odd'}       = ($itemnum + $offset) % 2;
 
 		if ($itemnum == $currsongind) {
-			$form{'currentsong'} = "current";
+			#$form{'currentsong'} = "current";
 
 			if (Slim::Music::Info::isRemoteURL($track)) {
 				$form{'title'} = Slim::Music::Info::standardTitle(undef, $track) || $track->url;
@@ -187,7 +188,7 @@
 
 		} else {
 
-			$form{'currentsong'} = undef;
+			#$form{'currentsong'} = undef;
 			$form{'title'}    = Slim::Music::TitleFormatter::infoFormat($track, $titleFormat);
 		}
 
Index: Slim/Web/Pages/Status.pm
===================================================================
--- Slim/Web/Pages/Status.pm	(revision 11801)
+++ Slim/Web/Pages/Status.pm	(working copy)
@@ -157,13 +200,6 @@
 		
 		Slim::Web::Pages->addSongInfo($client, $params, 1);
 
-		# for current song, display the playback bitrate instead.
-		my $undermax = Slim::Player::TranscodingHelper::underMax($client,Slim::Player::Playlist::song($client));
-
-		if (defined $undermax && !$undermax) {
-			$params->{'bitrate'} = string('CONVERTED_TO')." ".Slim::Utils::Prefs::maxRate($client).string('KBPS').' ABR';
-		}
-
 		if ($prefs->get('playlistdir')) {
 			$params->{'cansave'} = 1;
 		}
Index: HTML/EN/songinfo.html
===================================================================
--- HTML/EN/songinfo.html	(revision 11801)
+++ HTML/EN/songinfo.html	(working copy)
@@ -127,7 +127,7 @@
			</li>
		[% END %]

-		[% IF itemobj.prettyBitRate %] 
+		[% IF itemobj.bitrate %] 
			<li><div class="songInfoTitle">[% "BITRATE" | string; "COLON" | string %]</div>
				<div class="songInfoText">[% itemobj.prettyBitRate | html %]</div>
			</li>Index: Slim/Schema/Track.pm
===================================================================
--- Slim/Schema/Track.pm	(revision 11801)
+++ Slim/Schema/Track.pm	(working copy)
@@ -202,16 +202,36 @@
 }
 
 sub prettyBitRate {
-	my $self = shift;
-	my $only = shift;
+	my $self   = shift;
+	my $client = shift;
 
 	my $bitrate  = $self->bitrate;
 	my $vbrScale = $self->vbr_scale;
 
 	my $mode = defined $vbrScale ? 'VBR' : 'CBR';
+	my $format = defined $client ? $client->streamformat : '';
 
 	if ($bitrate) {
-		return int ($bitrate/1000) . Slim::Utils::Strings::string('KBPS') . ' ' . $mode;
+		my $convert  = '';
+		
+		if ( defined $client && $bitrate > 0 ) {
+
+			my $undermax = Slim::Player::TranscodingHelper::underMax($client, $self->url);
+			my $rate     = $bitrate;
+			
+
+			if (!$undermax) {
+
+				$rate = Slim::Utils::Prefs::maxRate($client) . $client->string('KBPS') . " ABR";
+			}
+
+			if (defined $undermax && !$undermax) { 
+
+				$convert = sprintf('(%s %s %s)', $client->string('CONVERTED_TO'), $rate, $format);
+			}
+		}
+
+		return int ($bitrate/1000) . Slim::Utils::Strings::string('KBPS') . ' ' . $mode . ' ' . ($convert eq '' ? $format : $convert);
 	}
 
 	return 0;