diff --git a/AUTHORS b/AUTHORS
index 224452557..543c738a1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -200,3 +200,4 @@ suggestions:
   Hector Arciga
   Jan Kunder
   jck
+  Michele Vetturi
diff --git a/ChangeLog b/ChangeLog
index 795b43fe5..0a47d6546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@ Features
 - New themes: dark-default-16.theme, dark-gray-blue-256.theme
 
 Bugs
+- TD-42 Cannot compile taskd - GNUTLS_VERSION undefined in diag.cpp (thanks
+        to Michele Vetturi).
 - #1511 sync init crashes if client certification file is empty or invalid
         (thanks to Marton Suranyi).
 - #1508 Show command highlight configuration (thanks to Nicolas Appriou).
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 151b06c1e..d57a72241 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -165,7 +165,11 @@ int CmdDiagnostics::execute (std::string& output)
 
   out << "  libgnutls: "
 #ifdef HAVE_LIBGNUTLS
+#ifdef GNUTLS_VERSION
       << GNUTLS_VERSION
+#elif LIBGNUTLS_VERSION
+      << LIBGNUTLS_VERSION
+#endif
 #else
       << "n/a"
 #endif