diff --git a/Makefile.am b/Makefile.am
index c802aa50..32bcade7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =  po intl lib deps src doc test
+SUBDIRS =  po lib deps src doc test
 
 ACLOCAL_AMFLAGS = -I m4 --install
 RST2HTML = @RST2HTML@
diff --git a/configure.ac b/configure.ac
index 43282307..37dadad6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,7 +596,7 @@ AC_C_BIGENDIAN
 AC_SYS_LARGEFILE
 
 # Checks for library functions.
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.18])
 AC_FUNC_ERROR_AT_LINE
 AC_PROG_GCC_TRADITIONAL
@@ -896,7 +896,6 @@ AC_CONFIG_FILES([Makefile
 		src/includes/Makefile
 		test/Makefile
 		po/Makefile.in
-		intl/Makefile
 		lib/Makefile
 		doc/Makefile
 		doc/manual-src/Makefile