diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi
index c010fd494..c49342807 100644
--- a/html/cgi-bin/mpfire.cgi
+++ b/html/cgi-bin/mpfire.cgi
@@ -367,7 +367,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_artists()){
+foreach (sort($mpd->collection->all_artists())){
 	if ( $_ ne '' ){
 		print "<option>".encode('utf-8', $_)."</option>\n";
 	}
@@ -384,7 +384,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_albums()){
+foreach (sort($mpd->collection->all_albums())){
 	if ( $_ ne '' ){
 		print "<option>".encode('utf-8', $_)."</option>\n";
 	}
@@ -403,7 +403,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_years()){
+foreach (sort($mpd->collection->all_years())){
 	if ( $_ ne '' ){
 		print "<option>$_</option>\n";
 	}
@@ -420,7 +420,7 @@ print <<END
 END
 ;
 
-foreach ($mpd->collection->all_genre()){
+foreach (sort($mpd->collection->all_genre())){
 	if ( $_ ne '' ){
 		print "<option>$_</option>\n";
 	}
diff --git a/lfs/mpfire b/lfs/mpfire
index c61c77fab..960fb34ae 100644
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -30,7 +30,7 @@ THISAPP    = mpfire-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpfire
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "mpd mpc alsa libshout libogg libmad libid3tag libvorbis"