diff --git a/bin/system-info.c b/bin/system-info.c
index 2be787c1f05fc359dde8aefd05863d3e7a088747..a0fa957a2aaf65cf6cffef43fce314796f377d7b 100644
--- a/bin/system-info.c
+++ b/bin/system-info.c
@@ -242,6 +242,12 @@ jsonify_graphics_issues (JsonBuilder *builder,
 
   if ((issues & SRT_GRAPHICS_ISSUES_SOFTWARE_RENDERING) != 0)
     json_builder_add_string_value (builder, "software-rendering");
+
+  if ((issues & SRT_GRAPHICS_ISSUES_TIMEOUT) != 0)
+    json_builder_add_string_value (builder, "timeout");
+
+  if ((issues & SRT_GRAPHICS_ISSUES_CANNOT_DRAW) != 0)
+    json_builder_add_string_value (builder, "cannot-draw");
 }
 
 static void
diff --git a/bin/system-info.md b/bin/system-info.md
index 80bbd3043b54997ba4efa2f141a0179487d3d056..b762c2f358b6a5700ce7f8e2b3d3f8cd176da018 100644
--- a/bin/system-info.md
+++ b/bin/system-info.md
@@ -406,6 +406,14 @@ keys:
             :   This graphics stack appears to be using unaccelerated
                 software rendering.
 
+            **timeout**
+            :   The test to check the given graphics mode timed out.
+
+            **cannot-draw**
+            :   The test to see if drawing works for the given graphics mode
+                had an error and was unable to draw.
+
+
 **locale-issues**
 :   An array of strings indicating locale-related issues.
     The array is empty if no problems were detected.