diff --git a/ChangeLog b/ChangeLog
index 396779cc5..5739850ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Makefile.maint (sc_prohibit_jm_in_m4): Don't hang when there
 	are no .m4 files.
+	(sc_require_config_h): Skip this test if there are no version-
+	controlled .c files.
 
 2006-09-08  Jim Meyering  <jim@meyering.net>
 
diff --git a/Makefile.maint b/Makefile.maint
index ef8a621a8..33643ee39 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -147,11 +147,14 @@ sc_no_have_config_h:
 
 # Nearly all .c files must include <config.h>.
 sc_require_config_h:
-	@grep -L '^# *include <config\.h>'				\
+	@if $(CVS_LIST_EXCEPT) | grep '\.c$$'; then			\
+	  grep -L '^# *include <config\.h>'				\
 		$$($(CVS_LIST_EXCEPT) | grep '\.c$$')			\
-	    | grep . &&							\
+	      | grep . &&						\
 	  { echo '$(ME): the above files do not include <config.h>'	\
-		1>&2; exit 1; } || :
+		1>&2; exit 1; } || :;					\
+	else :;								\
+	fi
 
 # Prohibit the inclusion of assert.h without an actual use of assert.
 sc_prohibit_assert_without_use: