diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index ce79c166cd..643a00075c 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -56,6 +56,7 @@
 
 #define TYPE_AUDIO 1
 #define TYPE_VIDEO 2
+#define TYPE_SUB   3
 
 int ts_prog;
 int ts_keep_broken=0;
@@ -412,9 +413,9 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es)
 			case SPU_PGS:
 				sh->type = 'p'; break;
         		}
-			priv->ts.streams[es->pid].id = priv->last_aid;
+			priv->ts.streams[es->pid].id = priv->last_sid;
 			priv->ts.streams[es->pid].sh = sh;
-			priv->ts.streams[es->pid].type = TYPE_AUDIO;
+			priv->ts.streams[es->pid].type = TYPE_SUB;
 			priv->last_sid++;
 		}
 	}