Index: Slim/Utils/Prefs.pm
===================================================================
--- Slim/Utils/Prefs.pm	(revision 13783)
+++ Slim/Utils/Prefs.pm	(working copy)
@@ -186,6 +186,7 @@
 		'timeFormat'            => q(|%I:%M %p),
 		'showArtist'            => 0,
 		'showYear'              => 0,
+		'sortAlbumsByYear'      => 0,
 		'guessFileFormats'	    => [
 									'(ARTIST - ALBUM) TRACKNUM - TITLE',
 									'/ARTIST/ALBUM/TRACKNUM - TITLE',
Index: Slim/Schema/ResultSet/Contributor.pm
===================================================================
--- Slim/Schema/ResultSet/Contributor.pm	(revision 13783)
+++ Slim/Schema/ResultSet/Contributor.pm	(working copy)
@@ -7,6 +7,31 @@
 
 use Slim::Utils::Prefs;
 
+my $prefs = preferences('server');
+
+my @albumSortRules = (
+	# 0: No special sorting
+	"concat('0', album.titlesort), album.disc",
+	
+	# 1: Sort by year ascending, unset years last
+	"CASE album.year " .
+	" WHEN 0 THEN 9999" .
+	" ELSE album.year " .
+	"END, concat('0', album.titlesort), album.disc",
+	
+	# 2: Sort by year ascending, unset years first
+	"album.year, concat('0', album.titlesort), album.disc",
+	
+	# 3: Sort by year descending, unset years last
+	"album.year DESC, concat('0', album.titlesort), album.disc",
+	
+	# 4: Sort by year ascending, unset years first
+	"CASE album.year " .
+	" WHEN 0 THEN 9999" .
+	" ELSE album.year " .
+	"END DESC, concat('0', album.titlesort), album.disc"
+);
+
 sub pageBarResults {
 	my $self = shift;
 
@@ -111,8 +136,9 @@
 		$sort = $rs->fixupSortKeys($sort);
 
 	} else {
-
-		$sort = "concat('0', album.titlesort), album.disc";
+	  
+		my $sortByYear = $prefs->get('sortAlbumsByYear') || 0;
+		$sort = $albumSortRules[$sortByYear] || $albumSortRules[0];
 	}
 
 	my $attr = {
Index: Slim/Web/Settings/Server/TextFormatting.pm
===================================================================
--- Slim/Web/Settings/Server/TextFormatting.pm	(revision 13783)
+++ Slim/Web/Settings/Server/TextFormatting.pm	(working copy)
@@ -23,7 +23,7 @@
 }
 
 sub prefs {
-	return ($prefs, qw(longdateFormat shortdateFormat timeFormat showArtist showYear titleFormatWeb) );
+	return ($prefs, qw(longdateFormat shortdateFormat timeFormat showArtist showYear sortAlbumsByYear titleFormatWeb) );
 }
 
 sub handler {
Index: HTML/EN/settings/server/formatting.html
===================================================================
--- HTML/EN/settings/server/formatting.html	(revision 13783)
+++ HTML/EN/settings/server/formatting.html	(working copy)
@@ -64,6 +64,23 @@
 	</div>
 
 	<div class="settingSection">
+
+		<div class="prefHead">[% "SETUP_SORTALBUMSBYYEAR" | string | upper %]</div>
+		<div class="prefDesc">[% "SETUP_SORTALBUMSBYYEAR_DESC" | string %]</div>
+
+		<select class="stdedit" name="sortAlbumsByYear" id="sortAlbumsByYear">
+
+			<option [% IF sortAlbumsByYear == 0 %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
+			<option [% IF sortAlbumsByYear == 1 %]selected [% END %]value="1">[% 'SETUP_SORTALBUMSBYYEAR_1' | getstring %]</option>
+			<option [% IF sortAlbumsByYear == 2 %]selected [% END %]value="2">[% 'SETUP_SORTALBUMSBYYEAR_2' | getstring %]</option>
+			<option [% IF sortAlbumsByYear == 3 %]selected [% END %]value="3">[% 'SETUP_SORTALBUMSBYYEAR_3' | getstring %]</option>
+			<option [% IF sortAlbumsByYear == 4 %]selected [% END %]value="4">[% 'SETUP_SORTALBUMSBYYEAR_4' | getstring %]</option>
+		
+		</select>
+
+	</div>
+
+	<div class="settingSection">
 	
 		<div class="groupHead">[% "SETUP_TITLEFORMAT" | string %]</div>
 		<div class="groupDesc">[% "SETUP_GROUP_TITLEFORMATS_DESC" | string %]</div>
Index: strings.txt
===================================================================
--- strings.txt	(revision 13783)
+++ strings.txt	(working copy)
@@ -4011,6 +4011,21 @@
 	NO	Du kan velge å vise årstallet et album ble gitt ut når du viser albumlisten eller albumomslag. Når valget er påskrudd vil årstallet vises sammen med tittelen til albumet.
 	ZH_CN	您可以选择通过浏览专辑或浏览专辑图象时是否一同显示专辑的年份。当您选择一同显示时，年份信息将显示在专辑标题旁边。
 
+SETUP_SORTALBUMSBYYEAR
+	EN	Sort Albums in Artist lists by year
+
+SETUP_SORTALBUMSBYYEAR_DESC
+	EN	You may choose to sort the albums by year when displayed within the artists list. Artist menu will be sorted by the year associated with that album. The order of sorting can be configured to be ascending or descended, with albums without years first or last. When disabled, the Albums listed from an Artist menu will be sorted alphabetic order.
+
+SETUP_SORTALBUMSBYYEAR_1
+	EN	Sort by year ascending, unset years last
+SETUP_SORTALBUMSBYYEAR_2
+	EN	Sort by year ascending, unset years first
+SETUP_SORTALBUMSBYYEAR_3
+	EN	Sort by year descending, unset years last
+SETUP_SORTALBUMSBYYEAR_4
+	EN	Sort by year descending, unset years first
+
 SETUP_SHOWARTIST
 	DE	Interpreten mit Alben anzeigen
 	EN	Show Artist with Albums