diff --git a/doc/Makefile.in b/doc/Makefile.in
index 126059351..0adc0f9a8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -612,6 +612,8 @@ check-texinfo:
 	grep non-zero $(srcdir)/*.texi && fail=1; \
 	grep -w NUL $(srcdir)/*.texi && fail=1; \
 	grep '\$$@"' $(srcdir)/*.texi && fail=1; \
+	grep -n filename $(srcdir)/*.texi|grep -vE 'setfilename|{filename}' \
+	  && fail=1; \
 	$(PERL) -e 1 2> /dev/null && { $(PERL) -ne \
 	  '/\bPOSIX\b/ && !/\@acronym{POSIX}/ && !/^\* / || /{posix}/ and print,exit 1' \
 	  $(srcdir)/*.texi 2> /dev/null || fail=1; }; \
diff --git a/src/Makefile.in b/src/Makefile.in
index 3087831dd..8175052d8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -933,7 +933,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \