diff --git a/ChangeLog b/ChangeLog
index 66af4d6fc0..282a941f28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-05  David Hampton  <hampton@employees.org>
+
+	* macros/openhbci.m4: Fix problem with latest versions of autoconf.
+
 2003-05-03  Christian Stimming  <stimming@tuhh.de>
 
 	* configure.in: Fix hbci and ofx test for handling --disable
diff --git a/macros/openhbci.m4 b/macros/openhbci.m4
index 3f9f56471c..c2b2ea3358 100644
--- a/macros/openhbci.m4
+++ b/macros/openhbci.m4
@@ -44,7 +44,7 @@ AC_MSG_RESULT($hbci_dir)
 
 min_openhbci_version=ifelse([$1], ,0.9.0.0,$1)
 AC_MSG_CHECKING(for OpenHBCI - version >= $min_openhbci_version)
-AC_LANG(C++)
+AC_LANG_PUSH(C++)
 
 if test "x$enable_openhbcitest" = "xyes" ; then
   ac_save_CXXFLAGS="$CXXFLAGS"
@@ -197,5 +197,6 @@ fi
 AC_SUBST(OPENHBCI_CFLAGS)
 AC_SUBST(OPENHBCI_LIBS)
 AC_SUBST(OPENHBCI_CXXFLAGS)
+AC_LANG_POP(C++)
 rm -f conf.openhbcitest
 ])