diff --git a/intl/.cvsignore b/intl/.cvsignore
index e32266e796..edf9557b78 100644
--- a/intl/.cvsignore
+++ b/intl/.cvsignore
@@ -4,3 +4,4 @@ ref-add.sed
 ref-del.sed
 po2tbl.sed
 Makefile
+libgnuintl.h
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 751291929d..a7b149771a 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,4 +1,12 @@
+2004-05-27  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* .cvsignore: add libgnuintl.h
+
+2004-05-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* libgnuintl.h: remove from cvs
+	* plurar.c: update
+
 2004-01-29  GNU  <bug-gnu-gettext@gnu.org>
 
 	* Version 0.14.1 released.
-
diff --git a/po/ChangeLog b/po/ChangeLog
index e44f54fce2..55d67da052 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-27  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* Makevars (XGETTEXT_OPTIONS): set the language explictly.
+
 2004-05-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* Makefile.in.in: change how we generate POTFILES.in a bit
diff --git a/po/Makevars b/po/Makevars
index 058038a1b9..3a4f4d5ca7 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --join-existing --keyword=_ --keyword=N_ --keyword=qt_
+XGETTEXT_OPTIONS = --language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=qt_
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index 0ebb27f340..c91081b401 100644
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-27  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* Makefile.am (BUILT_SOURCES): move lengthcommon.C from here...
+	(tex2lyx_SOURCES): ... to here
+
+	* lengthcommon.C: new file
+
 2004-04-30  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* preamble.C: recognize \lyxdot
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index f58491d10b..e3bdabfcf3 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
 EXTRA_DIST = test-structure.tex test-insets.tex
-DISTCLEANFILES += $(linked_files)
+DISTCLEANFILES += $(BUILT_SOURCES)
 
 #noinst_LTLIBRARIES = libtexparser.la
 #
@@ -18,7 +18,6 @@ BUILT_SOURCES = \
 	FloatList.C \
 	Floating.C \
 	counters.C \
-	lengthcommon.C \
 	lyxlayout.h \
 	lyxlayout.C \
 	lyxtextclass.C \
@@ -34,6 +33,7 @@ tex2lyx_SOURCES = \
 	context.h \
 	gettext.C \
 	gettext.h \
+	lengthcommon.C \
 	lyxfont.C \
 	lyxfont.h \
 	texparser.C \
@@ -54,4 +54,4 @@ $(BUILT_SOURCES) :
 	$(LN_S) $(top_srcdir)/src/$@ .
 
 rm_link_files:
-	rm -f $(linked_files)
+	rm -f $(BUILT_SOURCES)
diff --git a/src/tex2lyx/lengthcommon.C b/src/tex2lyx/lengthcommon.C
new file mode 100644
index 0000000000..43252162d8
--- /dev/null
+++ b/src/tex2lyx/lengthcommon.C
@@ -0,0 +1,7 @@
+// This file is here sine the master lengthcommon.C contains gettext
+// markers, and also that this file does not always exist (in the linked
+// case). So it is possible for po/POTFILES.in to get out of sync.
+// The compile will then fail. So to make sure that this file
+//(tex2lyx/lengthcommon.C) is not present in POTFILES.in we do a
+// include trick. (Lgb)
+#include "../lengthcommon.C"