diff --git a/src/rygel/rygel-root-device-factory.vala b/src/rygel/rygel-root-device-factory.vala
index c0b24f4..b3ba821 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/rygel/rygel-root-device-factory.vala
@@ -298,7 +298,7 @@ internal class Rygel.RootDeviceFactory {
 
         string mem = null;
         int len = -1;
-        doc.doc.dump_memory_format (out mem, out len, false);
+        doc.doc.dump_memory_enc (out mem, out len, "UTF-8");
 
         if (unlikely (len <= 0)) {
             var message = _("Failed to write modified description to %s");
diff --git a/src/rygel/rygel-xbox-hacks.vala b/src/rygel/rygel-xbox-hacks.vala
index ac925df..dba7e4f 100644
--- a/src/rygel/rygel-xbox-hacks.vala
+++ b/src/rygel/rygel-xbox-hacks.vala
@@ -29,7 +29,8 @@ internal errordomain Rygel.XBoxHacksError {
 }
 
 internal class Rygel.XBoxHacks : GLib.Object {
-    private static string AGENT = ".*Xbox.*|.*Allegro-Software-WebClient.*";
+    private static string AGENT =
+        ".*Xbox.*|.*Allegro-Software-WebClient.*|.*SEC_HHP_Galaxy S.*";
     private static string DMS = "urn:schemas-upnp-org:device:MediaServer";
     private static string DMS_V1 = DMS + ":1";
     private static string FRIENDLY_NAME_POSTFIX =
@@ -40,7 +41,8 @@ internal class Rygel.XBoxHacks : GLib.Object {
         unowned MessageHeaders headers = action.get_message ().request_headers;
         var agent = headers.get_one ("User-Agent");
         if (!(agent.contains ("Xbox")) &&
-            !(agent.contains ("Allegro-Software-WebClient"))) {
+            !(agent.contains ("Allegro-Software-WebClient")) &&
+            !(agent.contains ("SEC_HHP_Galaxy S"))) {
             throw new XBoxHacksError.NA (_("Not Applicable"));
         }
     }

