diff --git a/src/ChangeLog b/src/ChangeLog
index 5fcb4ae1ab..de10e188f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lyx_main.C (queryUserLyXDir): re-run automatically the configure
+	script if it is newer than the lyxrc.defaults in user directory
 
 2002-10-07 André Pönitz <poenitz@gmx.net>
 
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 6a8b7de19f..2befa6620e 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -571,10 +571,22 @@ void LyX::deadKeyBindings(kb_keymap * kbmap)
 
 void LyX::queryUserLyXDir(bool explicit_userdir)
 {
+	string const configure_script = AddName(system_lyxdir, "configure");
+
 	// Does user directory exist?
 	FileInfo fileInfo(user_lyxdir);
 	if (fileInfo.isOK() && fileInfo.isDir()) {
 		first_start = false;
+		Path p(user_lyxdir);
+		FileInfo script(configure_script);
+		FileInfo defaults("lyxrc.defaults");
+		if (!defaults.isOK()
+		    || defaults.getModificationTime() < script.getModificationTime()) {
+			lyxerr << _("LyX: reconfiguring user directory")
+			       << endl;
+			::system(configure_script.c_str());
+			lyxerr << "LyX: " << _("Done!") << endl;
+		}
 		return;
 	}
 
@@ -605,7 +617,7 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
 
 	// Run configure in user lyx directory
 	Path p(user_lyxdir);
-	::system(AddName(system_lyxdir, "configure").c_str());
+	::system(configure_script.c_str());
 	lyxerr << "LyX: " << _("Done!") << endl;
 }