diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml
index 7086b13..ed2a984 100644
--- a/Pages/Index.cshtml
+++ b/Pages/Index.cshtml
@@ -27,7 +27,7 @@ else
     <a class="action-muted">[..]</a>
     <a href="?@Model.path_oneup" class="entry-muted cfont"> Go back</a><br/>
     <a class="action-muted">[--]</a>
-    <a href="/@(Request.QueryString).m3u" class="entry-muted cfont"> Download m3u</a><br/><br/>
+    <a href="/m3u@(Request.QueryString).m3u" class="entry-muted cfont"> Download m3u</a><br/><br/>
     @foreach (var dir in Model.dirs)
     {
         <a class="action" href="#">[--]</a>
diff --git a/Pages/m3u.cshtml b/Pages/m3u.cshtml
new file mode 100644
index 0000000..a27eac8
--- /dev/null
+++ b/Pages/m3u.cshtml
@@ -0,0 +1,16 @@
+@page
+@using System.Web
+@model IndexModel
+@{
+    var path = HttpUtility.UrlDecode(Request.QueryString.Value.TrimStart('?'));
+    Layout = null;
+    Response.ContentType = "text/plain";
+}
+@if (Model.path.Contains(".."))
+{
+    return;
+}
+@foreach (var file in Model.files)
+{
+    @Html.Raw("https://" + Request.Host + "/" + Model.fullpath + "/" + file.Replace("?", "%3F") +"\n")
+}