diff --git a/.x-sc_prohibit_nonreentrant b/.x-sc_prohibit_nonreentrant
index a90e010087..cc323b073e 100644
--- a/.x-sc_prohibit_nonreentrant
+++ b/.x-sc_prohibit_nonreentrant
@@ -4,5 +4,7 @@ ChangeLog
 ^Makefile*
 ^docs/
 ^tests/
-^src/virsh.c
+^src/virsh\.c
+^src/console\.c
+^src/virterror\.c
 ^build-aux/
diff --git a/ChangeLog b/ChangeLog
index 2fe7d18650..3f7fdecd92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Feb 5 17:03:35 +0100 2009 Jim Meyering <meyering@redhat.com>
+
+	syntax-check: enable prohibit_nonreentrant
+	* .x-sc_prohibit_nonreentrant: Add src/console.c and virterror.c.
+	* Makefile.cfg (local-checks-to-skip): Don't exempt
+	sc_prohibit_nonreentrant.
+	* Makefile.nonreentrant: Don't exempt strerror.
+
 Thu Feb 5 17:03:35 +0100 2009 Jim Meyering <meyering@redhat.com>
 
 	remove remainder of offending strerror uses
diff --git a/Makefile.nonreentrant b/Makefile.nonreentrant
index 13fa59de41..b567f31474 100644
--- a/Makefile.nonreentrant
+++ b/Makefile.nonreentrant
@@ -79,7 +79,7 @@ NON_REENTRANT += setstate
 NON_REENTRANT += sgetspent
 NON_REENTRANT += srand48
 NON_REENTRANT += srandom
-# NON_REENTRANT += strerror
+NON_REENTRANT += strerror
 NON_REENTRANT += strtok
 NON_REENTRANT += tmpnam
 NON_REENTRANT += ttyname