diff --git a/Makefile b/Makefile
index 1bb5958..31816c2 100644
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,11 @@ master-cvsroot = :gserver:cvs.devel.redhat.com:/cvs/devel
 elfutils-portability.patch: elfutils-$(VERSION).tar.gz
 	@rm -rf elfutils-master elfutils-portable
 	cvs -d $(master-cvsroot) -Q export \
-	    -d elfutils-master elfutils
+	    -d elfutils-master -r HEAD elfutils/elfutils
 	cvs -d $(master-cvsroot) -Q export \
-	    -d elfutils-portable -r portable-branch elfutils
-	cd elfutils-master; autoreconf
-	cd elfutils-portable; autoreconf
+	    -d elfutils-portable -r portable-branch elfutils/elfutils
+	cd elfutils-master; autoreconf; rm -rf autom4te.cache
+	cd elfutils-portable; autoreconf; rm -rf autom4te.cache
 	diff -rpu elfutils-master elfutils-portable | \
 	filterdiff --remove-timestamps --strip=1 --addprefix=elfutils/ > $@.new
 	mv $@.new $@