diff --git a/autogen.sh b/autogen.sh
index 0a5d526e40..c668badb17 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@ ACLOCAL="aclocal"
 AUTOHEADER="autoheader"
 AUTOMAKE="automake -a -c --foreign"
 AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 intmax.m4 longdouble.m4 longlong.m4 nls.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
 
 # Discover what version of autoconf we are using.
 autoversion=`$AUTOCONF --version | head -n 1`
diff --git a/config/ChangeLog b/config/ChangeLog
index bd31a75b9c..cc51832021 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-26  Lars Gullik Bjonnes  <larsbj@lyx.org>
+
+	* nls.m4: new file
+
+	* Makefile.am: add more m4 files and reformat a bit
+
 2004-05-25  Lars Gullik Bjonnes  <larsbj@lyx.org>
 
 	* config.rpath: new file
diff --git a/config/Makefile.am b/config/Makefile.am
index 722b9eaf34..928c2e56f0 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,7 +1,33 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = common.am codeset.m4 libtool.m4 gettext.m4 \
-	lyxinclude.m4 lyxinclude25x.m4 \
-	glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 \
-	qt.m4 gtk--.m4 gnome--.m4 gnome.m4 pkg.m4 xforms.m4 pspell.m4 \
-	aspell.m4 cygwin.m4
+EXTRA_DIST = \
+	common.am \
+	aspell.m4 \
+	codeset.m4 \
+	cygwin.m4 \
+	gettext.m4 \
+	glibc21.m4 \
+	gnome--.m4 \
+	gnome.m4 \
+	gtk--.m4 \
+	iconv.m4 \
+	intmax.m4 \
+	isc-posix.m4 \
+	lcmessage.m4 \
+	libtool.m4 \
+	longdouble.m4 \
+	longlong.m4 \
+	lyxinclude25x.m4 \
+	lyxinclude.m4 \
+	nls.m4 \
+	pkg.m4 \
+	printf-posix.m4 \
+	progtest.m4 \
+	pspell.m4 \
+	qt.m4 \
+	signed.m4 \
+	size_max.m4 \
+	wchar_t.m4 \
+	wint_t.m4 \
+	xforms.m4 \
+	xsize.m4
diff --git a/config/nls.m4 b/config/nls.m4
new file mode 100644
index 0000000000..36bc49317c
--- /dev/null
+++ b/config/nls.m4
@@ -0,0 +1,49 @@
+# nls.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+  dnl Try to locate it.
+  MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+  AC_SUBST(MKINSTALLDIRS)
+])