diff --git a/CHANGELOG.md b/CHANGELOG.md
index db39eb8e3..449090d72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Replace bogus data with a better message and the vendor. [#665](https://github.com/greenbone/openvas/pull/665)
+- Improve log message for WMI connect failed or missing WMI support. [#670](https://github.com/greenbone/openvas/pull/670)
+
 ### Fixed
 - Fix issues discovered with clang compiler. [#654](https://github.com/greenbone/openvas/pull/654)
 - Fix gcc-9 and gcc-10 warnings. [#655](https://github.com/greenbone/openvas/pull/655)
diff --git a/nasl/nasl_wmi.c b/nasl/nasl_wmi.c
index 400d07cee..f34c8b82c 100644
--- a/nasl/nasl_wmi.c
+++ b/nasl/nasl_wmi.c
@@ -180,7 +180,8 @@ nasl_wmi_connect (lex_ctxt *lexic)
   handle = wmi_connect (argc, argv);
   if (!handle)
     {
-      g_message ("nasl_wmi_connect: WMI Connect failed");
+      g_message ("nasl_wmi_connect: WMI Connect failed or missing WMI support "
+                 "for the scanner");
       return NULL;
     }
 
@@ -320,7 +321,8 @@ nasl_wmi_connect_rsop (lex_ctxt *lexic)
   handle = wmi_connect_rsop (argc, argv);
   if (!handle)
     {
-      g_message ("nasl_wmi_connect_rsop: WMI Connect failed");
+      g_message ("nasl_wmi_connect_rsop: WMI Connect failed or missing WMI "
+                 "support for the scanner");
       return NULL;
     }
 
@@ -430,7 +432,8 @@ nasl_wmi_connect_reg (lex_ctxt *lexic)
   handle = wmi_connect_reg (argc, argv);
   if (!handle)
     {
-      g_message ("nasl_wmi_connect_reg: WMI Connect failed");
+      g_message ("nasl_wmi_connect_reg: WMI Connect failed or missing WMI "
+                 "support for the scanner");
       return NULL;
     }