diff --git a/ChangeLog b/ChangeLog
index bf2edac9c0..8a088f0033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* configure.in (VERSION_INFO): use AC_SUBST instead of AC_DEFINE
+	for VERSION_INFO
+
 2001-09-12  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* configure.in: do not set FRONTENDS to "xforms" when frontend is
diff --git a/configure.in b/configure.in
index 5293f98088..c32dcce5b7 100644
--- a/configure.in
+++ b/configure.in
@@ -327,7 +327,7 @@ ${FRONTEND_INFO}\
   LyX files dir:                  ${real_datadir}\n
 `
 
-AC_DEFINE_UNQUOTED(VERSION_INFO, "${VERSION_INFO}", Version information on the current build of LyX)
+AC_SUBST(VERSION_INFO)
 
 ### Finish the work.
 AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
@@ -339,6 +339,7 @@ AC_OUTPUT([Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
        src/Makefile \
+       src/version_info.h \
        src/mathed/Makefile \
        src/graphics/Makefile \
        src/insets/Makefile \
diff --git a/src/.cvsignore b/src/.cvsignore
index 67bfdd2a9a..ace611468c 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,5 +1,6 @@
 ext_l10n.h
 config.h
+version_info.h
 lyx
 Makefile
 Makefile.in
diff --git a/src/ChangeLog b/src/ChangeLog
index 960176ed6c..0c592965c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2001-09-26  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* .cvsignore: add version_info.h
+
+2001-09-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* version_info.h.in: new file
+
+	* Makefile.am: add version_info.h.in
+
+	* lyx_main.C (commandLineVersionInfo): use version_info defined in
+	version_info.h instead of VERSION_INFO
+
 2001-09-24  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* text.C (selectNextWordToSpellcheck): reverted change to if-block.
diff --git a/src/Makefile.am b/src/Makefile.am
index 70c42bcb06..33c8d01a30 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
 	$(PSPELL_LIBS) @AIKSAURUS_LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
-EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h
+EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version_info.h.in
 ETAGS_ARGS = --lang=c++
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
@@ -213,6 +213,7 @@ lyx_SOURCES = \
 	vc-backend.C \
 	vc-backend.h \
 	version.h \
+	version_info.h.in \
 	vms_defines.h \
 	vspace.C \
 	vspace.h
@@ -220,7 +221,8 @@ lyx_SOURCES = \
 lyx_main.o: lyx_main.C lyx_main.h config.h version.h lyx_gui.h \
 	lyx_gui_misc.h lyxrc.h support/path.h support/filetools.h \
 	bufferlist.h debug.h support/FileInfo.h lastfiles.h intl.h \
-	lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h
+	lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h \
+	version_info.h.in
 	$(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \
 	  -DTOP_SRCDIR=\"$(top_srcdir)\" -c $(top_srcdir)/src/lyx_main.C
 
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 69c9aa8496..795c4360db 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -18,6 +18,7 @@
 #endif
 
 #include "version.h"
+#include <version_info.h>
 #include "lyx_main.h"
 #include "lyx_gui.h"
 #include "LyXView.h"
@@ -779,7 +780,7 @@ void commandLineVersionInfo()
 	lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
 	lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
 
-	lyxerr << VERSION_INFO << endl;
+	lyxerr << version_info << endl;
 }
 
 
diff --git a/src/version_info.h.in b/src/version_info.h.in
new file mode 100644
index 0000000000..c297e2403c
--- /dev/null
+++ b/src/version_info.h.in
@@ -0,0 +1,20 @@
+/* -*- C++ -*- */
+/* This file contains configuration information configuration file for
+   LyX. It was generated by autoconf's configure. Do not modify it.
+   
+   * This file is part of
+   * ======================================================
+   *
+   *           LyX, the High Level Word Processor
+   *
+   *           Copyright 1995 Matthias Ettrich
+   *           Copyright 1995, 2001 The LyX Team.
+   *
+   *======================================================*/
+
+#ifndef VERSION_INFO_H
+#define VERSION_INFO_H
+
+char const * version_info = "@VERSION_INFO@";
+
+#endif