Index: HTML/EN/settings/server/formatting.html
===================================================================
--- HTML/EN/settings/server/formatting.html	(revision 10659)
+++ HTML/EN/settings/server/formatting.html	(working copy)
@@ -61,6 +61,16 @@
 		
 		</select>
 
+		<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 NOT sortAlbumsByYear %]selected [% END %]value="0">[% 'DISABLED' | getstring %]</option>
+			<option [% IF sortAlbumsByYear %]selected [% END %]value="1">[% 'ENABLED' | getstring %]</option>
+		
+		</select>
+
 	</div>
 
 	<div class="settingSection">
Index: Slim/Schema/ResultSet/Contributor.pm
===================================================================
--- Slim/Schema/ResultSet/Contributor.pm	(revision 10659)
+++ Slim/Schema/ResultSet/Contributor.pm	(working copy)
@@ -112,7 +112,21 @@
 
 	} else {
 
-		$sort = "concat('0', album.titlesort), album.disc";
+		if (my $sortByYear = Slim::Utils::Prefs::get('sortAlbumsByYear')) {
+			$sort = 
+			# Sort by year
+			#	"album.year, concat('0', album.titlesort), album.disc";
+		
+			# Sort by year, with un-yeared albums at the end
+				"CASE album.year " .
+				" WHEN 0 THEN 9999" .
+				" ELSE album.year " .
+				"END, concat('0', album.titlesort), album.disc";
+		}
+		else
+		{
+			$sort = "concat('0', album.titlesort), album.disc";
+		}
 	}
 
 	my $attr = {
Index: Slim/Utils/Prefs.pm
===================================================================
--- Slim/Utils/Prefs.pm	(revision 10659)
+++ Slim/Utils/Prefs.pm	(working copy)
@@ -171,6 +171,7 @@
 		'longdateFormat'	=> q(%A, %B |%d, %Y),
 		'shortdateFormat'	=> q(%m/%d/%Y),
 		'showYear'		=> 0,
+		'sortAlbumsByYear'      => 0,
 		'timeFormat'		=> q(|%I:%M:%S %p),
 		'titleFormatWeb'	=> 1,
 		'ignoreDirRE'		=> '',
Index: Slim/Web/Settings/Server/TextFormatting.pm
===================================================================
--- Slim/Web/Settings/Server/TextFormatting.pm	(revision 10659)
+++ Slim/Web/Settings/Server/TextFormatting.pm	(working copy)
@@ -30,6 +30,7 @@
 		timeFormat
 		showArtist
 		showYear
+		sortAlbumsByYear
 	);
 
 	# If this is a settings update
Index: strings.txt
===================================================================
--- strings.txt	(revision 10659)
+++ strings.txt	(working copy)
@@ -3934,6 +3934,12 @@
 	NL	Je kunt kiezen om het jaar te laten zien bij bekijken op albums of hoesafbeeldingen. Indien actief zal het jaar getoond worden naast de albumtitel.
 	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. When enabled, the Albums listed from an Artist menu will be sorted by the year associated with that album with albums without years listed last. When disabled, the Albums listed from an Artist menu will be sorted alphabetic order.
+
 SETUP_SHOWARTIST
 	DE	Interpreten beim Durchsuchen der Alben anzeigen
 	EN	Show Artist with Albums