diff --git a/src/ChangeLog b/src/ChangeLog
index 59bc1c6ed3..afa6e1ddf6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2003-07-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
+	* messages.C (getLocaleDir): use lyx_localedir()
+
 	* lyxlex_pimpl.C (setFile): compress stuff
 
 	* buffer.C (writeFile): add some compression stuff
diff --git a/src/messages.C b/src/messages.C
index 4302f41e65..a8e5576a12 100644
--- a/src/messages.C
+++ b/src/messages.C
@@ -12,6 +12,7 @@
 #include "messages.h"
 #include "debug.h"
 #include "support/filetools.h"
+#include "support/path_defines.h"
 
 using namespace lyx::support;
 
@@ -27,7 +28,7 @@ string const & getLocaleDir()
 	if (locale_dir.empty()) {
 		locale_dir = GetEnvPath("LYX_LOCALEDIR");
 		if (locale_dir.empty())
-			locale_dir = LOCALEDIR;
+			locale_dir = lyx_localedir();
 	}
 	return locale_dir;
 }
diff --git a/src/support/path_defines.C.in b/src/support/path_defines.C.in
index ec5689b696..58301f685c 100644
--- a/src/support/path_defines.C.in
+++ b/src/support/path_defines.C.in
@@ -55,6 +55,12 @@ string const & lyx_top_srcdir()
 	return lts;
 }
 
+} // namespace anon
+
+
+namespace lyx {
+namespace support {
+
 
 /* The absolute path to the system-level lyx locale directory.
  * (Make-time value.)
@@ -65,11 +71,6 @@ string const & lyx_localedir()
 	return ll;
 }
 
-} // namespace anon
-
-
-namespace lyx {
-namespace support {
 
 string const & build_lyxdir()
 {
diff --git a/src/support/path_defines.h b/src/support/path_defines.h
index cfb5728bb1..4846c2af35 100644
--- a/src/support/path_defines.h
+++ b/src/support/path_defines.h
@@ -17,6 +17,8 @@
 namespace lyx {
 namespace support {
 
+string const & lyx_localedir();
+
 /* The absolute path to the lyx build directory.
  * (Make-time value.)
  */