diff --git a/Makefile.am b/Makefile.am
index 3e59bc3..75beb48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,9 @@ MAINTAINERCLEANFILES = \
 	install-sh \
 	ltmain.sh \
 	missing \
+	m4/intl.m4 \
+	m4/intldir.m4 \
+	m4/intlmacosx.m4 \
 	m4/libtool.m4 \
 	m4/ltoptions.m4 \
 	m4/ltsugar.m4 \
diff --git a/configure.ac b/configure.ac
index 84308dd..abfe68f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ AC_SUBST(HAVE_LIBCLANG)
 
 # if cross compiling, disable NLS support.
 # It's not worth the trouble, at least for now.
-if test "${build}" != "${host}" -o "${build}" != "${target}" -o "${host}" != "${target}"; then
+if "${host}" != "${target}"; then
   enable_nls=no
 fi