diff --git a/classes/Controller/DownloadController.php b/classes/Controller/DownloadController.php
index dece054..daf0f15 100644
--- a/classes/Controller/DownloadController.php
+++ b/classes/Controller/DownloadController.php
@@ -44,7 +44,13 @@ class DownloadController extends BaseController
     {
         $url = $this->getVideoPageUrl($request);
 
-        $this->video = $this->downloader->getVideo($url, $this->getFormat($request), $this->getPassword($request));
+        $format = $this->getFormat($request);
+
+        if ($this->config->remux && $request->getQueryParam('remux')) {
+            $this->video = $this->downloader->getVideo($url, $format . "+bestaudio", $this->getPassword($request));
+        } else {
+            $this->video = $this->downloader->getVideo($url, $format, $this->getPassword($request));
+        }
 
         try {
             if ($this->config->convert && $request->getQueryParam('audio')) {
diff --git a/templates/info.tpl b/templates/info.tpl
index d315588..18febfc 100644
--- a/templates/info.tpl
+++ b/templates/info.tpl
@@ -32,6 +32,10 @@
                 {html_options name='format' options=$formats selected=$defaultFormat id="format" class="formats monospace"}
                 <br/>
                 <br/>
+                <input type="checkbox" checked name="remux" id="remux" value="1"/>
+                <label for="remux">{t}Remux with best audio{/t}</label>
+                <br/>
+                <br/>
             {/if}
             {if $config->stream}
                 <input type="checkbox" {if $config->stream !== 'ask'}checked{/if} name="stream" id="stream"/>