diff --git a/ChangeLog b/ChangeLog
index 41e2f0401..4e7c6af47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
 - TW-44 Space handling in dateformat (thanks to Louis-Claude Canon).
 - TW-72 extend info report with urgency column
 - TW-115 allow "0day" durations for UDAs.
+- TW-128 new helper command; _envs.
 - TW-168 modification of due date relative to current due date (thanks to Dirk
          Sarpe).
 - TW-186 Increase for numerical UDAs (thanks to Steffen Uhlig).
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index c47dec897..9d8be9a79 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -210,6 +210,18 @@ int CmdDiagnostics::execute (std::string& output)
       << location.mode ()
       << "\n";
 
+  char* env = getenv ("TASKRC");
+  if (env)
+    out << "     TASKRC: "
+        << env
+        << "\n";
+
+  env = getenv ("TASKDATA");
+  if (env)
+    out << "   TASKDATA: "
+        << env
+        << "\n";
+
   out << "    Locking: "
       << (context.config.getBoolean ("locking")
            ? STRING_CMD_DIAG_ENABLED