diff --git a/Makefile.in b/Makefile.in
index 34ab92ab7..d62c5557e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,6 +49,8 @@ shlib_mode = @SHLIB_MODE@
 SUBDIRS = compat common @ZLIB_SRC@ plugins/group_file plugins/sudoers \
 	  plugins/system_group src include doc
 
+SAMPLES = plugins/sample
+
 VERSION = @PACKAGE_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
@@ -287,14 +289,14 @@ package: sudo.pp
 	    version=$(VERSION) $(PPVARS)
 
 clean: config.status
-	for d in $(SUBDIRS); do \
+	for d in $(SUBDIRS) $(SAMPLES); do \
 	    (cd $$d && exec $(MAKE) $@); \
 	done
 
 mostlyclean: clean
 
 distclean: config.status
-	for d in $(SUBDIRS); do \
+	for d in $(SUBDIRS) $(SAMPLES); do \
 	    (cd $$d && exec $(MAKE) $@); \
 	done
 	-rm -rf Makefile pathnames.h config.h config.status config.cache \
diff --git a/common/Makefile.in b/common/Makefile.in
index 6f4989516..7ee9e484e 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -138,7 +138,7 @@ check: $(TEST_PROGS)
 	fi
 
 clean:
-	-$(LIBTOOL) --mode=clean rm -f *.lo *.o *.la *.a stamp-* core *.core core.*
+	-$(LIBTOOL) --mode=clean rm -f $(TEST_PROGS) *.lo *.o *.la *.a stamp-* core *.core core.* regress/*/*.out
 
 mostlyclean: clean
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a10fec581..9dc0e7953 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -361,7 +361,7 @@ clean:
 mostlyclean: clean
 
 distclean: clean
-	-rm -rf Makefile config.log *.man
+	-rm -rf Makefile config.log *.man *.mdoc
 
 clobber: distclean
 
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 30076f3fb..70baeb334 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -318,8 +318,9 @@ check: $(TEST_PROGS) visudo testsudoers
 		./check_symbols .libs/sudoers$(soext) $(shlib_exp); \
 		rval=`expr $$rval + $$?`; \
 	    fi; \
-	    ./check_wrap $(srcdir)/regress/logging/check_wrap.in > check_wrap.out; \
-	    diff check_wrap.out $(srcdir)/regress/logging/check_wrap.out.ok; \
+	    mkdir -p regress/logging; \
+	    ./check_wrap $(srcdir)/regress/logging/check_wrap.in > regress/logging/check_wrap.out; \
+	    diff regress/logging/check_wrap.out $(srcdir)/regress/logging/check_wrap.out.ok; \
 	    rval=`expr $$rval + $$?`; \
 	    passed=0; failed=0; total=0; \
 	    mkdir -p regress/sudoers; \
@@ -389,7 +390,9 @@ check: $(TEST_PROGS) visudo testsudoers
 	fi
 
 clean:
-	-$(LIBTOOL) --mode=clean rm -f $(PROGS) $(TEST_PROGS) *.lo *.o *.la *.a stamp-* core *.core core.* *.out *.toke *.err *.inc
+	-$(LIBTOOL) --mode=clean rm -f $(PROGS) $(TEST_PROGS) *.lo *.o *.la \
+	    *.a stamp-* core *.core core.* regress/*/*.out regress/*/*.toke \
+	    regress/*/*.err
 
 mostlyclean: clean