diff --git a/ChangeLog b/ChangeLog
index 17cee97d7b..f45a8650a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-03  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* configure.ac: define BOOST_USER_CONFIG
+
 2004-03-10  Ronald Florence <ron@18james.com>
 
 	* README.MacOSX: update
diff --git a/boost/ChangeLog b/boost/ChangeLog
index b1fe8e846d..5386b41bd2 100644
--- a/boost/ChangeLog
+++ b/boost/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-03  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* libs/filesystem/src/Makefile.am (AM_CXXFLAGS): define
+	BOOST_USER_CONFIG
+	* libs/signals/src/Makefile.am: ditto
+	* libs/regex/src/Makefile.am: ditto
+
 2004-03-29  Angus Leeming  <leeming@lyx.org>
 
 	* boost/format/internals.hpp: change the type of
diff --git a/boost/libs/filesystem/src/Makefile.am b/boost/libs/filesystem/src/Makefile.am
index 2a42b8f255..816dbf3f26 100644
--- a/boost/libs/filesystem/src/Makefile.am
+++ b/boost/libs/filesystem/src/Makefile.am
@@ -4,10 +4,11 @@ noinst_LTLIBRARIES = libboostfilesystem.la
 
 INCLUDES = $(BOOST_INCLUDES)
 
+AM_CXXFLAGS = -DBOOST_USER_CONFIG="<config.h>"
+
 libboostfilesystem_la_SOURCES = \
 	convenience.cpp \
 	exception.cpp \
 	Makefile.am \
 	operations_posix_windows.cpp \
 	path_posix_windows.cpp
-
diff --git a/boost/libs/regex/src/Makefile.am b/boost/libs/regex/src/Makefile.am
index 477b3d25bc..6cf9cfe723 100644
--- a/boost/libs/regex/src/Makefile.am
+++ b/boost/libs/regex/src/Makefile.am
@@ -4,6 +4,8 @@ noinst_LTLIBRARIES = libboostregex.la
 
 INCLUDES = $(BOOST_INCLUDES)
 
+AM_CXXFLAGS = -DBOOST_USER_CONFIG="<config.h>"
+
 libboostregex_la_SOURCES = \
 	cpp_regex_traits.cpp \
 	c_regex_traits_common.cpp \
diff --git a/boost/libs/signals/src/Makefile.am b/boost/libs/signals/src/Makefile.am
index 079f0c7df8..0bbec6fd50 100644
--- a/boost/libs/signals/src/Makefile.am
+++ b/boost/libs/signals/src/Makefile.am
@@ -4,6 +4,8 @@ noinst_LTLIBRARIES = libboostsignals.la
 
 INCLUDES = $(BOOST_INCLUDES)
 
+AM_CXXFLAGS = -DBOOST_USER_CONFIG="<config.h>"
+
 libboostsignals_la_SOURCES = \
 	connection.cpp \
 	signal_base.cpp \
diff --git a/configure.ac b/configure.ac
index 9aa611350e..efb3ccaf1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,6 +371,8 @@ int mkstemp(char*);
 #define USE_BOOST_FORMAT 0
 #endif
 
+#define BOOST_USER_CONFIG <config.h>
+
 #if defined(ENABLE_ASSERTIONS)
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 #else
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2f914c2342..1aaecd8ae3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -187,6 +187,7 @@ src/output_plaintext.C
 src/paragraph.C
 src/rowpainter.C
 src/support/globbing.C
+src/tex2lyx/lengthcommon.C
 src/text.C
 src/text2.C
 src/text3.C