diff --git a/.gitignore b/.gitignore
index 24db9307..6e3f5a28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ config.h.W32
 configh.dos
 make-[0-9]*/
 make-[0-9]*.tar.*
+checkcfg.*.log
diff --git a/maintMakefile b/maintMakefile
index f8bb678a..cacab4c9 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -230,16 +230,22 @@ check-alt-config: \
 	checkcfg.CPPFLAGS^-DNO_OUTPUT_SYNC \
 	checkcfg.CPPFLAGS^-DNO_ARCHIVES
 
+NR_MAKE = $(MAKE)
+
+# Check builds both with build.sh and with make
 checkcfg.%: distdir
-	@  rm -rf $(distdir)/_build \
+	@( rm -rf $(distdir)/_build \
 	&& mkdir $(distdir)/_build \
 	&& cd $(distdir)/_build \
 	&& echo "Testing configure with $(subst ^,=,$*)" \
 	&& ../configure --srcdir=.. $(subst ^,=,$*) \
 		$(AM_DISTCHECK_CONFIGURE_FLAGS) $(DISTCHECK_CONFIGURE_FLAGS) \
 		CFLAGS='$(AM_CFLAGS)' \
-	&& $(MAKE) $(AM_MAKEFLAGS) \
-	&& $(MAKE) $(AM_MAKEFLAGS) check
+	&& ./build.sh \
+	&& ./make $(AM_MAKEFLAGS) check \
+	&& rm -f *.o make \
+	&& $(NR_MAKE) $(AM_MAKEFLAGS) \
+	&& ./make $(AM_MAKEFLAGS) check ) 2>&1 | tee checkcfg.$*.log
 
 
 ## --------------- ##