diff --git a/ChangeLog b/ChangeLog
index cda83989cb..fe99156078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* configure.ac: check for target name as early as possible (fixes
+	bug in change below).
+
 2005-10-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* configure.ac: call LYX_USE_PACKAGING early. Sanitize PACKAGE
diff --git a/configure.ac b/configure.ac
index 338a6aa5f5..495cc09b7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ AC_CONFIG_AUX_DIR(config)
 # first the version
 VERSION="1.4.0cvs"
 LYX_CHECK_VERSION
+AC_CANONICAL_TARGET
 # Check how the files should be packaged
 LYX_USE_PACKAGING
 LYX_VERSION_SUFFIX
@@ -19,7 +20,6 @@ if test "${enable_maintainer_mode+set}" != set; then
   enable_maintainer_mode=$lyx_devel_version
 fi
 AM_MAINTAINER_MODE
-AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)