diff --git a/config/ChangeLog b/config/ChangeLog
index 31493b169b..c21a92ccce 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-13  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* configure.in: change AC_LANG(XX) back to the AC_LANG_XX variant.
+
 2002-08-11  Angus Leeming  <leeming@lyx.org>
 
 	* lyxinclude.m4 (LYX_CXX_EXPLICIT): remove trailing semi-colon after
diff --git a/config/configure.in b/config/configure.in
index 1a866295d8..fa5b34dd1d 100644
--- a/config/configure.in
+++ b/config/configure.in
@@ -65,7 +65,7 @@ LYX_USE_FRONTEND
 ### Check for a C++ compiler
 LYX_PROG_CXX
 ### Some checks on what the C++ compiler can(not) do
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
 dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
@@ -214,7 +214,7 @@ LYX_USE_XFORMS_IMAGE_LOADER
 
 ### Setup GNU gettext
 dnl GNU gettext is written in C
-AC_LANG(C)
+AC_LANG_C
 # Some tests that may be useful for gettext
 AC_C_CONST
 AC_C_INLINE
@@ -227,7 +227,7 @@ esac
 
 AC_SUBST(LINGUAS)
 
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
 
 # some standard header files
 AC_HEADER_DIRENT
@@ -255,9 +255,9 @@ dnl This is a slight hack: the tests generated by autoconf 2.52 do not
 dnl work correctly because of some conflict with stdlib.h with g++ 2.96
 dnl We aim to remove this eventually, since we should test as much as
 dnl possible with the compiler which will use the functions (JMarc)
-AC_LANG(C)
+AC_LANG_C
 AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
 
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES