diff --git a/webif/html/browse/download.jim b/webif/html/browse/download.jim
index 41447e7..dcf113f 100755
--- a/webif/html/browse/download.jim
+++ b/webif/html/browse/download.jim
@@ -10,7 +10,7 @@ set urlbase [cgi_get base ""]
 
 # Default to just downloading the raw file.
 set url $file
-set mime "video/ts"
+set mime "video/mp2t"
 
 if {[string match {*.ts} $file]} {
 	if {![catch {set ts [ts fetch $file]}]} {
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 8fbc763..68906d4 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -269,7 +269,7 @@ proc {system dlnadb} {} {
 }
 
 proc {system _dlnaurl} {file urlbase} {
-	set mime "video/ts"
+	set mime "video/mp2t"
 	if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
 		return {}
 	}
@@ -278,7 +278,10 @@ proc {system _dlnaurl} {file urlbase} {
 	    from tblresource join tblmedia using (mediaid)
 	    where localurl = '%s'} $file]
 	if {[llength $muri]} {
-		lassign [lindex $muri 0] x mime x xuri
+		lassign [lindex $muri 0] x maybemime x xuri
+		if {$maybemime ne "video/ts"} {
+			set mime $maybemime
+		}
 	} else {
 		# Try for partially linked entry
 		set muri [$db query {