--- mythtv/libs/libmythupnp/upnpcds.cpp	2017-02-01 04:49:25.000000000 -0500
+++ mythtv/libs/libmythupnp/upnpcds.cpp	2017-02-19 19:56:21.709929473 -0500
@@ -1070,7 +1070,7 @@
     // For metadata requests the request ID will be the ID of the result, so
     // we don't need to do anything
     if (currentName == name.toLower() && !currentValue.isEmpty() &&
-        currentValue == value.toLower())
+        currentValue.toLower() == value.toLower())
         return requestId;
     else if (currentName == name.toLower() && currentValue.isEmpty())
         return QString("%1=%2").arg(requestId).arg(value);
--- mythtv/libs/libmythupnp/upnphelpers.cpp	2017-02-01 04:49:25.000000000 -0500
+++ mythtv/libs/libmythupnp/upnphelpers.cpp	2017-02-19 19:58:58.914387254 -0500
@@ -120,7 +120,7 @@
     // information in the database for each file and can determine this
     // stuff 'properly'
     QString sCountryCode = gCoreContext->GetLocale()->GetCountryCode();
-    bool isNorthAmerica = (sCountryCode == "us" || sCountryCode == "ca" ||
+    bool isNorthAmerica = (sCountryCode.toLower() == "us" || sCountryCode == "ca" ||
                             sCountryCode == "mx"); // North America (NTSC/ATSC)
 
     if (container == "MPEG2-PS")
@@ -199,7 +199,7 @@
     }
     else if (mimeType == "audio/mpeg")
     {
-        sProfileName = "MP3X";
+        sProfileName = "MP3";
     }
     else if (mimeType == "audio/x-ms-wma")
     {
--- mythtv/programs/mythbackend/devicemaster.xml	2017-02-01 04:49:25.000000000 -0500
+++ mythtv/programs/mythbackend/devicemaster.xml	2017-02-12 15:18:58.537038457 -0500
@@ -18,20 +18,5 @@
         <dlna:X_DLNADOC xmlns:dlna="urn:schemas-dlna-org:device-1-0">DMS-1.51</dlna:X_DLNADOC>
         <dlna:X_DLNACAP xmlns:dlna="urn:schemas-dlna-org:device-1-0"></dlna:X_DLNACAP>
         <!-- uncomment to override defaults <serialNumber>MYTHTV-UPNP-01</serialNumber> -->
-        <deviceList>
-            <device>
-            <!-- UDN auto generated -->
-            <friendlyName>MythTV Master Media Server</friendlyName>
-            <deviceType>urn:schemas-mythtv-org:device:MasterMediaServer:1</deviceType>
-            <manufacturer>MythTV</manufacturer>
-            <manufacturerURL>http://www.mythtv.org/</manufacturerURL>
-            <modelName>MythTV Master Media Server</modelName>
-            <!-- uncomment to override defaults <modelNumber>0.20</modelNumber> -->
-            <modelDescription>MythTV AV Media Server</modelDescription>
-            <modelURL>http://www.mythtv.org/</modelURL>
-            <presentationURL>/</presentationURL>
-            <!-- uncomment to override defaults <serialNumber>MYTHTV-UPNP-01</serialNumber> -->
-            </device>
-        </deviceList>
     </device>
 </root>