diff --git a/ChangeLog b/ChangeLog
index cbccdb8f9..64f770c66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-13  Christophe Fergeau <teuf@users.sourceforge.net>
+
+	* configure.in: added fr to ALL_LINGUAS
+
 2002-07-12  Havoc Pennington  <hp@pobox.com>
 
 	* src/session.c (warn_about_lame_clients_and_finish_interact):
@@ -101,6 +105,7 @@
 
 	* src/common.h: add a grab op for alt+esc window cycling
 
+>>>>>>> 1.366
 2002-07-05  Havoc Pennington  <hp@pobox.com>
 
 	* src/themes/Makefile.am (THEMES): Take Gorilla out until it gets
diff --git a/configure.in b/configure.in
index db84d0dc4..dda2e27a9 100644
--- a/configure.in
+++ b/configure.in
@@ -82,7 +82,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-ALL_LINGUAS="az ca da de es gl it ja ko lv ms no pl pt ru sk sv tr uk zh_TW"
+ALL_LINGUAS="az ca da de es fr gl it ja ko lv ms no pl pt ru sk sv tr uk zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 ## here we get the flags we'll actually use