diff --git a/README b/README
index 9349d51d3..6695c9878 100644
--- a/README
+++ b/README
@@ -261,10 +261,12 @@ If you're sure you've found a bug - e.g. if one of my programs crashes
 with an obscur error message, or if the resulting file is missing part
 of the original data, then by all means submit a bug report.
 
-I use Bugzilla (https://www.bunkus.org/bugzilla/) as my bug
-database. You can submit your bug reports there. Please be as verbose
-as possible - e.g. include the command line, if you use Windows or
-Linux etc.pp. If at all possible please include sample files as well
-so that I can reproduce the issue. If they are larger than 1M then
-please upload them somewhere and post a link in the Bugzilla bug
-report.
+I use Trac (https://www.bunkus.org/trac/) as my bug database. You can
+submit your bug reports there. Please be as verbose as possible -
+e.g. include the command line, if you use Windows or Linux etc.pp.
+
+If at all possible please include sample files as well so that I can
+reproduce the issue. If they are larger than 1M then please upload
+them somewhere (e.g. to my FTP server: host name "ftp.bunkus.org",
+user name "upload", password "only" -- each without the quotes) and
+post a link or note in the bug report.
diff --git a/TODO b/TODO
index c9072153b..701fe86a9 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@
 
 The contents of this file have been moved to by bug tracking system.
 
-https://www.bunkus.org/bugzilla/buglist.cgi?query_format=advanced&product=mkvtoolnix&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=enhancement
+https://www.bunkus.org/trac/report/1
 
 Apart from that as a short reminder list for myself for the near future: