diff --git a/.x-sc_prohibit_nonreentrant b/.x-sc_prohibit_nonreentrant
index ac783c06b8..0ab2f5d1df 100644
--- a/.x-sc_prohibit_nonreentrant
+++ b/.x-sc_prohibit_nonreentrant
@@ -1,10 +1,10 @@
 ^gnulib/
 ^po/
-ChangeLog
+^ChangeLog$
+^ChangeLog-old$
 ^Makefile*
 ^docs/
 ^tests/
-^tools/virsh\.c
-^tools/console\.c
-^src/util/virterror\.c
+^tools/virsh\.c$
+^tools/console\.c$
 ^build-aux/
diff --git a/src/util/virterror.c b/src/util/virterror.c
index e421ab787e..657cb3f802 100644
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -1157,7 +1157,7 @@ const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen)
     return errBuf;
 # endif
 #else
-    /* Mingw lacks strerror_r() and its strerror() is definitely not
+    /* Mingw lacks strerror_r and its strerror is definitely not
      * threadsafe, so safest option is to just print the raw errno
      * value - we can at least reliably & safely look it up in the
      * header files for debug purposes