diff --git a/NEWS b/NEWS
index 0555979..d8275a3 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
 - Add support for other operating systems.
 - Switch to autoconf from our little genconfig.sh.
 - Enable the subtitle menu on some Samsung TV's.
+- Add subtitle support for Panasonic TV's.
+- Add workarounds for LifeTab tablets' bad behavior.
 
 1.0.22 - Released 24-Aug-2011
 --------------------------------
diff --git a/minidlnatypes.h b/minidlnatypes.h
index 63ce852..0574514 100644
--- a/minidlnatypes.h
+++ b/minidlnatypes.h
@@ -82,6 +82,7 @@ enum client_types {
 	ESamsungSeriesA,
 	ESamsungSeriesB,
 	EMarantzDMP,
+	ELifeTab,
 	EStandardDLNA150 = 100
 };
 
diff --git a/upnphttp.c b/upnphttp.c
index f70f452..60c8eef 100644
--- a/upnphttp.c
+++ b/upnphttp.c
@@ -448,6 +448,17 @@ intervening space) by either an integer or the keyword "infinite". */
 			{
 				h->reqflags |= FLAG_CAPTION;
 			}
+			else if(strncasecmp(line, "FriendlyName", 12)==0)
+			{
+				p = colon + 1;
+				while(isspace(*p))
+					p++;
+				if(strstrc(p, "LIFETAB", '\r'))
+				{
+					h->req_client = ELifeTab;
+					h->reqflags |= FLAG_MS_PFS;
+				}
+			}
 		}
 next_header:
 		while(!(line[0] == '\r' && line[1] == '\n'))
diff --git a/upnpsoap.c b/upnpsoap.c
index 7ebb80d..6e095d1 100644
--- a/upnpsoap.c
+++ b/upnpsoap.c
@@ -165,10 +165,11 @@ GetSortCapabilities(struct upnphttp * h, const char * action)
 		"<u:%sResponse "
 		"xmlns:u=\"%s\">"
 		"<SortCaps>"
-                  "dc:title,"
-                  "dc:date,"
+		  "dc:title,"
+		  "dc:date,"
 		  "upnp:class,"
-                  "upnp:originalTrackNumber"
+		  "upnp:album,"
+		  "upnp:originalTrackNumber"
 		"</SortCaps>"
 		"</u:%sResponse>";
 
@@ -549,6 +550,10 @@ parse_sort_criteria(char *sortCriteria, int *error)
 		{
 			strcat(order, "d.DISC, d.TRACK");
 		}
+		else if( strcasecmp(item, "upnp:album") == 0 )
+		{
+			strcat(order, "d.ALBUM");
+		}
 		else
 		{
 			printf("Unhandled SortCriteria [%s]\n", item);