diff --git a/config/ChangeLog b/config/ChangeLog
index d1f34cf31d..cf2ede8431 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* relyx_configure.in:
+	* relyx_configure.ac: use AC_CANONICAL_TARGET
+
+	* lyxinclude.m4 (LYX_USE_PACKAGING): set libdir correctly
+
 2005-02-02  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* configure.in:
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index cce54430f2..d8cda0c6fc 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -675,11 +675,13 @@ case $lyx_use_packaging in
    macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) 
            default_prefix="/Applications/LyX.app"
 	   bindir='${prefix}/Contents/MacOS'
+	   libdir='${prefix}/Contents/Resources'
 	   datadir='${prefix}/Contents/Resources'
 	   mandir='${prefix}/Contents/Resources/man' ;;
   windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout]) 
            default_prefix="C:/Program Files/LyX"
 	   bindir='${prefix}/bin'
+	   libdir='${prefix}/Resources'
 	   datadir='${prefix}/Resources'
 	   mandir='${prefix}/Resources/man' ;;
     posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout]) 
diff --git a/config/relyx_configure.ac b/config/relyx_configure.ac
index 57be7155cc..ef6b9f38ab 100644
--- a/config/relyx_configure.ac
+++ b/config/relyx_configure.ac
@@ -8,6 +8,7 @@ dnl PACKAGE=reLyX
 dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
 
 AM_MAINTAINER_MODE
+AC_CANONICAL_TARGET
 
 AC_ARG_WITH(version-suffix,
   [  --with-version-suffix[=<version>]  install lyx files as lyx<version>],
diff --git a/config/relyx_configure.in b/config/relyx_configure.in
index 7703cd62a0..d710407985 100644
--- a/config/relyx_configure.in
+++ b/config/relyx_configure.in
@@ -8,6 +8,7 @@ dnl PACKAGE=reLyX
 dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
 
 AM_MAINTAINER_MODE
+AC_CANONICAL_TARGET
 
 AC_ARG_WITH(version-suffix,
   [  --with-version-suffix[=<version>]  install lyx files as lyx<version>],
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8eec720e12..84968b7b5c 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* reLyX/acinclude.m4 (RELYX_USE_PACKAGING): set libdir correctly
+
 2005-02-02  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* configure.m4: instead of \input-ing the layout files directly in
diff --git a/lib/reLyX/acinclude.m4 b/lib/reLyX/acinclude.m4
index 565369f794..d64d881f62 100644
--- a/lib/reLyX/acinclude.m4
+++ b/lib/reLyX/acinclude.m4
@@ -126,10 +126,12 @@ AC_MSG_RESULT($lyx_use_packaging)
 case $lyx_use_packaging in 
    macosx) default_prefix="/Applications/LyX.app"
 	   bindir='${prefix}/Contents/MacOS'
+	   libdir='${prefix}/Contents/Resources'
 	   datadir='${prefix}/Contents/Resources'
 	   mandir='${prefix}/Contents/Resources/man' ;;
   windows) default_prefix="C:/Program Files/LyX"
 	   bindir='${prefix}/bin'
+	   libdir='${prefix}/Resources'
 	   datadir='${prefix}/Resources'
 	   mandir='${prefix}/Resources/man' ;;
     posix) default_prefix=$ac_default_prefix ;;