diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
index 7d1c9cbd8..3fc3db2b4 100755
--- a/modules/stream/stream_raw.pl
+++ b/modules/stream/stream_raw.pl
@@ -45,6 +45,7 @@
     if ($name =~ /^\d+_\d+\.\w+$/) {
         if ($title =~ /\w/) {
             $name = $title;
+            $name .= sprintf(" - %dx%02d", $season, $episode) if $season and $episode;
             if ($subtitle =~ /\w/) {
                 $name .= " - $subtitle";
             }
diff --git a/modules/stream/tv.pl b/modules/stream/tv.pl
index 6093b9210..11d574343 100755
--- a/modules/stream/tv.pl
+++ b/modules/stream/tv.pl
@@ -24,12 +24,12 @@
     }
 
 # Get the basename from the database
-    my $sh = $dbh->prepare('SELECT basename, title, subtitle, endtime-starttime
+    my $sh = $dbh->prepare('SELECT basename, title, subtitle, endtime-starttime, season, episode
                               FROM recorded
                              WHERE starttime=FROM_UNIXTIME(?)
                                    AND recorded.chanid   = ?');
     $sh->execute($starttime, $chanid);
-    our ($basename, $title, $subtitle, $runtime) = $sh->fetchrow_array();
+    our ($basename, $title, $subtitle, $runtime, $season, $episode) = $sh->fetchrow_array();
     $sh->finish;
 
 # No match?