diff --git a/tools/cnvwindeps.c b/tools/cnvwindeps.c
index 516f441b51..b26b3c9b67 100644
--- a/tools/cnvwindeps.c
+++ b/tools/cnvwindeps.c
@@ -213,10 +213,18 @@ int main(int argc, char **argv, char **envp)
           if (begin)
             {
               path = skip_spaces(next);
+              if (*path == '#')
+                {
+                  /* Comment line */
+
+                  puts(g_line);
+                  break;
+                }
+
               next = strchr(path, ':');
               if (!next)
                 {
-                  fprintf(stderr, "%lu: Expected semicolon\n", g_lineno);
+                  fprintf(stderr, "%lu: Expected colon\n", g_lineno);
                   exit(EXIT_FAILURE);
                 }