diff --git a/ChangeLog b/ChangeLog
index 347db8c14..0dbee3a44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -165,6 +165,7 @@
 - Segfault when 'project:android' is split into 'and' and 'roid' (thanks to
   Richard Boß).
 - Fixed typo in 'newest' and 'oldest' report definitions (thanks to Richard Boß).
+- The 'diagnostics' command obeys color settings.
 
 ------ current release ---------------------------
 
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 9d8be9a79..7fe7fc0ee 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -64,7 +64,9 @@ CmdDiagnostics::CmdDiagnostics ()
 // kind of questions we always have to ask whenever something is wrong.
 int CmdDiagnostics::execute (std::string& output)
 {
-  Color bold ("bold");
+  Color bold;
+  if (context.color ())
+    bold = Color ("bold");
 
   std::stringstream out;
   out << "\n"