diff --git a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
index 04c8097..50615cc 100644
--- a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
+++ b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
@@ -458,7 +458,7 @@ public:
         int count = NumSegments();
         for (int i = 0; i < count; i++)
         {
-            HLSSegment *segment    = GetSegment(i);
+            HLSSegment *segment = GetSegment(i);
             segment->Lock();
             if (segment->Size() > 0)
             {
@@ -2163,7 +2163,9 @@ int HLSRingBuffer::ParseM3U8(const QByteArray *buffer, StreamsList *streams)
                 }
                 else
                 {
-                    HLSStream *hls = ParseStreamInformation(line, uri);
+                    // Line may be percent encoded
+                    QString url    = QUrl::fromEncoded (uri.toAscii()).toString();
+                    HLSStream *hls = ParseStreamInformation(line, url);
                     if (hls)
                     {
                         /* Download playlist file from server */
@@ -2259,7 +2261,9 @@ int HLSRingBuffer::ParseM3U8(const QByteArray *buffer, StreamsList *streams)
                 err = ParseEndList(hls);
             else if (!line.startsWith(QLatin1String("#")) && !line.isEmpty())
             {
-                hls->AddSegment(segment_duration, title, line);
+                // Line may be percent encoded
+                QString url = QUrl::fromEncoded (line.toAscii()).toString();
+                hls->AddSegment(segment_duration, title, url);
                 segment_duration = -1; /* reset duration */
                 title = "";
             }