diff --git a/ChangeLog b/ChangeLog
index d3756b9ce4..b1a1d0c59a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-03  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* configure.in: remove LYX_REGEX call
+
 2002-06-02  John Levon  <moz@compsoc.man.ac.uk>
 
 	* acconfig.h: add FORMS_IMAGE_H_LOCATION
@@ -5,7 +9,7 @@
 	* autogen.sh: add xforms.m4
 
 	* configure.in: use XFORMS_IMAGE_LIB
- 
+
 2002-05-30  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* lyx.man: lyx honors variable LYX_DIR_13x
diff --git a/boost/ChangeLog b/boost/ChangeLog
index 6d4d6dbf1d..4655b94b53 100644
--- a/boost/ChangeLog
+++ b/boost/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-03  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* libs/regex/src/Makefile.am: only compile the source files that
+	we actually have to.
+
 2002-05-28  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* libs/regex/src/.cvsignore: ignore .lo, .deps and .libs
diff --git a/boost/libs/regex/src/Makefile.am b/boost/libs/regex/src/Makefile.am
index 87bdff8a96..423f2fee30 100644
--- a/boost/libs/regex/src/Makefile.am
+++ b/boost/libs/regex/src/Makefile.am
@@ -6,16 +6,17 @@ INCLUDES = $(BOOST_INCLUDES)
 
 libboostregex_la_SOURCES = \
 	cpp_regex_traits.cpp \
-	cregex.cpp \
 	c_regex_traits_common.cpp \
 	c_regex_traits.cpp \
-	fileiter.cpp \
 	instances.cpp \
-	posix_api.cpp \
 	primary_transform.hpp \
 	regex.cpp \
-	regex_debug.cpp \
-	regex_synch.cpp \
 	w32_regex_traits.cpp \
-	wide_posix_api.cpp \
-	winstances.cpp
+	winstances.cpp \
+	regex_synch.cpp
+
+#	cregex.cpp \
+#	fileiter.cpp \
+#	posix_api.cpp \
+#	wide_posix_api.cpp \
+#	regex_debug.cpp
diff --git a/configure.in b/configure.in
index e2206cfc07..290ef284b1 100644
--- a/configure.in
+++ b/configure.in
@@ -98,9 +98,6 @@ if test "x$enable_assertions" = xyes ; then
     [Define if you want assertions to be enabled in the code])
 fi
 
-### We need a regex implementation, so we provide our own if none is found.
-LYX_REGEX
-
 ### Library Files
 dnl by testing these we check if it is ok to have
 dnl -lc and -lm as args to the compiler
@@ -143,7 +140,7 @@ AC_CHECK_LIB(Aiksaurus, main,
 	],,"-lbz2")
 fi
 AC_SUBST(AIKSAURUS_LIBS)
- 
+
 ### Setup libtool
 AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f7ce0b3646..21ff572da3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ src/converter.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
-src/ext_l10n.h
 src/FloatList.C
 src/frontends/controllers/biblio.C
 src/frontends/controllers/ButtonController.h
@@ -28,6 +27,7 @@ src/frontends/controllers/ControlThesaurus.C
 src/frontends/controllers/ControlVCLog.C
 src/frontends/controllers/frnt_lang.C
 src/frontends/controllers/helper_funcs.C
+src/frontends/gnome/GLog.C
 src/frontends/LyXView.C
 src/frontends/qt2/Alert_pimpl.C
 src/frontends/qt2/FileDialog.C