diff --git a/Makefile.in b/Makefile.in
index c829ca29bd5..aa11e6b0b74 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -942,6 +942,7 @@ extraclean: $(extraclean_dirs:=_extraclean)
 	-rm -f config-tmp-* aclocal.m4 configure
 	-rm -f ./*~ \#* etc/refcards/emacsver.tex doc/emacs/emacsver.texi
 	-rm -f info/*.info info/dir
+	-rmdir info 2>/dev/null
 
 # The src subdir knows how to do the right thing
 # even when the build directory and source dir are different.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index bf9b01f1437..1973452b223 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -127,6 +127,7 @@ distclean bootstrap-clean: mostlyclean
 maintainer-clean: distclean
 	rm -f TAGS gnulib.mk
 extraclean: distclean
+	-rmdir sys 2>/dev/null
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean