diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 23058be..3935db2 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -179,9 +179,14 @@ autotools_do_configure() {
 			else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
 				# We'd call gettextize here if it wasn't so broken...
 					cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
-					if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
+					if [ -d ${S}/po/ ]; then
 						cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
 					fi
+					for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do
+						for j in `find ${S} -name $i | grep -v aclocal-copy`; do
+							rm $j
+						done
+					done
 				fi
 			fi
 		fi