diff --git a/Makefile.am b/Makefile.am
index bbfa0141..1c152cae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ ChangeLog:
 	cvs2cl -U cvsusers --fsf
 
 cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` tinc-$(VERSION).tar.gz; do\
+	for f in $(CVS_CREATED) `find . -name Makefile.in` tinc-$(VERSION).tar.gz; do\
 	  rm -Rf "$$f"; \
 	done
 
diff --git a/autogen.sh b/autogen.sh
index 186d1e30..21a0f4c1 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,10 @@
 
 DIE=0
 
-alias make=${MAKE:-`which gmake || which make`}
+if ${MAKE:-gmake} -q -C . autogen.sh 2> /dev/null
+then
+  alias make=${MAKE:-gmake}
+fi
 
 srcdir="`/bin/pwd`"