diff --git a/doc/issue_tracker.txt b/doc/issue_tracker.txt
index a41b8e5044..ced2d7f361 100644
--- a/doc/issue_tracker.txt
+++ b/doc/issue_tracker.txt
@@ -8,9 +8,8 @@ Overview:
 FFmpeg uses Trac for tracking issues, new issues and changes to
 existing issues can be done through a web interface.
 It is possible to subscribe to individual issues by adding yourself to the
-nosy list or to subscribe to the ffmpeg-issues mailing list which receives
-a mail for every change to every issue. Replies to such mails will also
-be properly added to the respective issue.
+Cc list or to subscribe to the ffmpeg-trac mailing list which receives
+a mail for every change to every issue.
 (the above does all work already after light testing)
 The subscription URL for the ffmpeg-trac list is:
 http(s)://ffmpeg.org/mailman/listinfo/ffmpeg-trac
@@ -21,16 +20,19 @@ NOTE: issue = (bug report || patch || feature request)
 
 Type:
 -----
-bug
+bug / defect
     An error, flaw, mistake, failure, or fault in FFmpeg or libav* that
     prevents it from behaving as intended.
 
-feature request
+feature request / enhancement
     Request of support for encoding or decoding of a new codec, container
     or variant.
     Request of support for more, less or plain different output or behavior
     where the current implementation cannot be considered wrong.
 
+license violation
+    ticket to keep track of (L)GPL violations of ffmpeg by others
+
 patch
     A patch as generated by diff which conforms to the patch submission and
     development policy.
@@ -80,6 +82,17 @@ closed
     final state
 
 
+Analyzed flag:
+--------------
+Bugs which have been analyzed and where it is understood what causes them
+and which exact chain of events triggers them. This analysis should be
+available as a message in the bug report.
+Note, do not change the status to analyzed without also providing a clear
+and understandable analysis.
+This state implicates that the bug either has been reproduced or that
+reproduction is not needed as the bug is already understood.
+
+
 Type/Status/Substatus:
 ----------
 */new/new
@@ -107,17 +120,8 @@ Type/Status/Substatus:
     Issues for which some information has been requested by the developers,
     but which has not been provided by anyone within reasonable time.
 
-bug/open/reproduced
-    Bugs which have been reproduced.
 
 bug/open/analyzed
-    Bugs which have been analyzed and where it is understood what causes them
-    and which exact chain of events triggers them. This analysis should be
-    available as a message in the bug report.
-    Note, do not change the status to analyzed without also providing a clear
-    and understandable analysis.
-    This state implicates that the bug either has been reproduced or that
-    reproduction is not needed as the bug is already understood.
 
 bug/open/needs_more_info
     Bug reports which are incomplete and or where more information is needed
@@ -175,10 +179,8 @@ above without asking on ffmpeg-dev first!
 Note2, if you provide the requested info do not forget to remove the
 needs_more_info substate.
 
-Topic:
-------
-A topic is a tag you should add to your issue in order to make grouping them
-easier.
+Component:
+----------
 
 avcodec
     issues in libavcodec/*
@@ -198,6 +200,9 @@ ffmpeg
 ffplay
     issues in or related to ffplay.c
 
+ffprobe
+    issues in or related to ffprobe.c
+
 ffserver
     issues in or related to ffserver.c
 
@@ -207,5 +212,5 @@ build system
 regression
     bugs which were working in a past revision
 
-roundup
+trac
     issues related to our issue tracker