diff --git a/docs/bugs.html b/docs/bugs.html
index 445d9cac1e3..44955d3f7c3 100644
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -37,11 +37,14 @@ Please follow these bug reporting guidelines:
 the problem.
 <li>Check if your bug is already reported in the database.
 <li>Monitor your bug report for requests for additional information, etc.
+<li>Attach the output of running glxinfo or wglinfo.
+This will tell us the Mesa version, which device driver you're using, etc.
 <li>If you're reporting a crash, try to use your debugger (gdb) to get a stack
 trace. Also, recompile Mesa in debug mode to get more detailed information.
 <li>Describe in detail how to reproduce the bug, especially with games
 and applications that the Mesa developers might not be familiar with.
-<li>Provide a simple GLUT-based test program if possible
+<li>Provide an <a href="https://github.com/apitrace/apitrace">apitrace</a>
+or simple GLUT-based test program if possible.
 </ul>
 
 <p>