diff --git a/ChangeLog b/ChangeLog
index 20c8aac200..ad7bd111da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-06  Allan Rae  <rae@lyx.org>
+
+	* po/Makefile.in.in (POTFILES.in, POTFILES): Fixed
+	to be gettext.m4 friendly again.  ext_l10n.h is now
+	generated into $top_srcdir instead of $top_builddir
+	so that lyx.pot will be built correctly -- without
+	duplicate parsing of ext_l10n.h.
+
 2000-10-04  John Levon  <moz@compsoc.man.ac.uk>
 
 	* src/frontends/kde/FormCitation.C: make the dialog
diff --git a/po/ChangeLog b/po/ChangeLog
index cb7ae63b42..e7c2a78bc4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-06  Allan Rae  <rae@lyx.org>
+
+	* Makefile.in.in: Over zealous in yesterdays work.
+	Cleaned up to be gettext.m4 friendly.  Should work fine now.
+
+2000-10-05  Allan Rae  <rae@lyx.org>
+
+	* Makefile.in.in: First attempt at generating POTFILES.in
+	and ../src/ext_l10n.h via a Makefile
+
 2000-07-26  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* no.po: update a bit for new ui
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 6ec0168b05..7e00d47978 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -16,8 +16,6 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-top_builddir = ..
-
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = $(prefix)/@DATADIRNAME@
@@ -53,7 +51,7 @@ stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
 
 POTFILE_IN_DEPS := $(shell find $(top_srcdir)/src -name Makefile.am)
 
-POTFILES = $(top_builddir)/src/ext_l10n.h \
+POTFILES = \
 
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
@@ -90,7 +88,7 @@ all-yes: cat-id-tbl.c $(CATALOGS)
 all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(srcdir) \
+	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
@@ -111,9 +109,11 @@ $(srcdir)/stamp-cat-id: $(PACKAGE).pot
 	fi
 	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
 
-$(top_builddir)/src/ext_l10n.h: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc $(top_srcdir)/lib/ui/default.ui
-	grep -i -E "submenu|item|optitem" < $(top_srcdir)/lib/ui/default.ui | cut -d '"' -f 2 | awk '{printf "_(\"%s\");\n", $$0}' > $@
-	cat $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc | grep -i -E "[ ]*style .+$$" | cut -d ' ' -f 2 | sort | uniq | awk '{printf "_(\"%s\");\n", $$0}' >> $@
+$(top_srcdir)/src/ext_l10n.h: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc $(top_srcdir)/lib/ui/default.ui
+	grep -i -E "submenu|item|optitem" < $(top_srcdir)/lib/ui/default.ui | cut -d '"' -f 2 | \
+		awk '{printf "_(\"%s\");\n", $$0}' > $@
+	cat $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc | grep -i -E "[ ]*style .+$$" | \
+		cut -d ' ' -f 2 | sort | uniq | awk '{printf "_(\"%s\");\n", $$0}' >> $@
 
 install: install-exec install-data
 install-exec:
@@ -201,7 +201,7 @@ mostlyclean:
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *~ *.old *.bak
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -235,16 +235,25 @@ update-po: Makefile
 	  fi; \
 	done
 
-POTFILES.in: $(top_builddir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
-	grep -l -E "_\(\".*\"\)" `find $(top_srcdir)/src -name \*.[hHC]` $< | \
-	awk 'BEGIN {FS= ":"} {print $$1}' | sed -e '/xforms.forms/d' | \
-	sort -f -d | uniq > POTFILES.in
+POTFILES.in: $(top_srcdir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
+	rm -f $@-t \
+	&& ( cd $(top_srcdir); \
+	     grep -l -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
+	     awk 'BEGIN {FS= ":"} {print $$1}' | \
+	     sed -e '/xforms.forms/d' | \
+	     sort -f -d | uniq ) > $@-t \
+	&& mv $@-t $@
 
 POTFILES: POTFILES.in
-	( rm -f $@-t $@ \
+	( if test 'x$(srcdir)' != 'x.'; then \
+	      posrcprefix='$(top_srcdir)/'; \
+	  else \
+	      posrcprefix="../"; \
+	  fi; \
+	  rm -f $@-t $@ \
 	    && (sed  < $(srcdir)/$@.in \
 		    -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	& \\\\@" \
+		    -e "s@.*@	$$posrcprefix& \\\\@" \
 		| sed -e '$$s/\\$$//') > $@-t \
 	    && chmod a-w $@-t \
 	    && mv $@-t $@ )
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2646ee8293..555803d5ac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,127 +1,130 @@
-../src/buffer.C
-../src/bufferlist.C
-../src/BufferView2.C
-../src/bufferview_funcs.C
-../src/BufferView_pimpl.C
-../src/Chktex.C
-../src/ColorHandler.C
-../src/combox.C
-../src/converter.C
-../src/credits.C
-../src/credits_form.C
-../src/CutAndPaste.C
-../src/exporter.C
-../src/ext_l10n.h
-../src/filedlg.C
-../src/FontLoader.C
-../src/form1.C
-../src/frontends/gnome/FormCitation.C
-../src/frontends/gnome/FormIndex.C
-../src/frontends/gnome/FormPrint.C
-../src/frontends/gnome/FormToc.C
-../src/frontends/gnome/FormUrl.C
-../src/frontends/gnome/Menubar_pimpl.C
-../src/frontends/kde/FormCitation.C
-../src/frontends/kde/formcitationdialog.C
-../src/frontends/kde/FormCopyright.C
-../src/frontends/kde/FormIndex.C
-../src/frontends/kde/formindexdialog.C
-../src/frontends/kde/FormRef.C
-../src/frontends/kde/formrefdialog.C
-../src/frontends/kde/FormToc.C
-../src/frontends/kde/formtocdialog.C
-../src/frontends/kde/FormUrl.C
-../src/frontends/kde/formurldialog.C
-../src/frontends/xforms/FormBase.h
-../src/frontends/xforms/FormCitation.C
-../src/frontends/xforms/form_citation.C
-../src/frontends/xforms/FormCopyright.C
-../src/frontends/xforms/form_copyright.C
-../src/frontends/xforms/FormDocument.C
-../src/frontends/xforms/form_document.C
-../src/frontends/xforms/FormError.C
-../src/frontends/xforms/form_error.C
-../src/frontends/xforms/FormGraphics.C
-../src/frontends/xforms/form_graphics.C
-../src/frontends/xforms/FormIndex.C
-../src/frontends/xforms/form_index.C
-../src/frontends/xforms/FormParagraph.C
-../src/frontends/xforms/form_paragraph.C
-../src/frontends/xforms/FormPreferences.C
-../src/frontends/xforms/form_preferences.C
-../src/frontends/xforms/FormPrint.C
-../src/frontends/xforms/form_print.C
-../src/frontends/xforms/FormRef.C
-../src/frontends/xforms/form_ref.C
-../src/frontends/xforms/FormTabular.C
-../src/frontends/xforms/form_tabular.C
-../src/frontends/xforms/FormToc.C
-../src/frontends/xforms/form_toc.C
-../src/frontends/xforms/FormUrl.C
-../src/frontends/xforms/form_url.C
-../src/frontends/xforms/Menubar_pimpl.C
-../src/gettext.h
-../src/insets/figinset.C
-../src/insets/form_graphics.C
-../src/insets/insetbib.C
-../src/insets/inset.C
-../src/insets/inseterror.C
-../src/insets/insetert.C
-../src/insets/insetexternal.C
-../src/insets/insetfloat.C
-../src/insets/insetfoot.C
-../src/insets/insetgraphics.C
-../src/insets/insetinclude.C
-../src/insets/insetindex.C
-../src/insets/insetinfo.C
-../src/insets/insetlabel.C
-../src/insets/insetlist.C
-../src/insets/insetmarginal.C
-../src/insets/insetminipage.C
-../src/insets/insetparent.C
-../src/insets/insettabular.C
-../src/insets/insettext.C
-../src/insets/insettheorem.C
-../src/insets/insettoc.C
-../src/insets/inseturl.C
-../src/intl.C
-../src/kbsequence.C
-../src/language.C
-../src/LaTeX.C
-../src/LaTeXLog.C
-../src/layout.C
-../src/layout_forms.C
-../src/LColor.C
-../src/log_form.C
-../src/LyXAction.C
-../src/lyx.C
-../src/lyx_cb.C
-../src/lyxfont.C
-../src/lyxfr0.C
-../src/lyxfr1.C
-../src/lyxfunc.C
-../src/lyx_gui.C
-../src/lyx_gui_misc.C
-../src/lyx_main.C
-../src/lyx_sendfax.C
-../src/lyx_sendfax_main.C
-../src/LyXSendto.C
-../src/lyxvc.C
-../src/LyXView.C
-../src/mathed/formula.C
-../src/mathed/formulamacro.C
-../src/mathed/math_forms.C
-../src/mathed/math_panel.C
-../src/MenuBackend.C
-../src/minibuffer.C
-../src/paragraph.C
-../src/print_form.C
-../src/spellchecker.C
-../src/sp_form.C
-../src/support/filetools.C
-../src/support/getUserName.C
-../src/support/path.C
-../src/support/path.h
-../src/tabular.C
-../src/text2.C
-../src/text.C
+src/buffer.C
+src/bufferlist.C
+src/BufferView2.C
+src/bufferview_funcs.C
+src/BufferView_pimpl.C
+src/Chktex.C
+src/ColorHandler.C
+src/combox.C
+src/converter.C
+src/credits.C
+src/credits_form.C
+src/CutAndPaste.C
+src/exporter.C
+src/ext_l10n.h
+src/filedlg.C
+src/FontLoader.C
+src/form1.C
+src/frontends/gnome/FormCitation.C
+src/frontends/gnome/FormIndex.C
+src/frontends/gnome/FormPrint.C
+src/frontends/gnome/FormToc.C
+src/frontends/gnome/FormUrl.C
+src/frontends/gnome/Menubar_pimpl.C
+src/frontends/kde/FormCitation.C
+src/frontends/kde/formcitationdialog.C
+src/frontends/kde/FormCopyright.C
+src/frontends/kde/FormIndex.C
+src/frontends/kde/formindexdialog.C
+src/frontends/kde/formindexdialogdata.C
+src/frontends/kde/FormPrint.C
+src/frontends/kde/formprintdialogdata.C
+src/frontends/kde/FormRef.C
+src/frontends/kde/formrefdialog.C
+src/frontends/kde/FormToc.C
+src/frontends/kde/formtocdialog.C
+src/frontends/kde/FormUrl.C
+src/frontends/kde/formurldialog.C
+src/frontends/xforms/FormBase.h
+src/frontends/xforms/FormCitation.C
+src/frontends/xforms/form_citation.C
+src/frontends/xforms/FormCopyright.C
+src/frontends/xforms/form_copyright.C
+src/frontends/xforms/FormDocument.C
+src/frontends/xforms/form_document.C
+src/frontends/xforms/FormError.C
+src/frontends/xforms/form_error.C
+src/frontends/xforms/FormGraphics.C
+src/frontends/xforms/form_graphics.C
+src/frontends/xforms/FormIndex.C
+src/frontends/xforms/form_index.C
+src/frontends/xforms/FormParagraph.C
+src/frontends/xforms/form_paragraph.C
+src/frontends/xforms/FormPreferences.C
+src/frontends/xforms/form_preferences.C
+src/frontends/xforms/FormPrint.C
+src/frontends/xforms/form_print.C
+src/frontends/xforms/FormRef.C
+src/frontends/xforms/form_ref.C
+src/frontends/xforms/FormTabular.C
+src/frontends/xforms/form_tabular.C
+src/frontends/xforms/FormToc.C
+src/frontends/xforms/form_toc.C
+src/frontends/xforms/FormUrl.C
+src/frontends/xforms/form_url.C
+src/frontends/xforms/Menubar_pimpl.C
+src/gettext.h
+src/insets/figinset.C
+src/insets/form_graphics.C
+src/insets/insetbib.C
+src/insets/inset.C
+src/insets/inseterror.C
+src/insets/insetert.C
+src/insets/insetexternal.C
+src/insets/insetfloat.C
+src/insets/insetfoot.C
+src/insets/insetgraphics.C
+src/insets/insetinclude.C
+src/insets/insetindex.C
+src/insets/insetinfo.C
+src/insets/insetlabel.C
+src/insets/insetlist.C
+src/insets/insetmarginal.C
+src/insets/insetminipage.C
+src/insets/insetparent.C
+src/insets/insettabular.C
+src/insets/insettext.C
+src/insets/insettheorem.C
+src/insets/insettoc.C
+src/insets/inseturl.C
+src/intl.C
+src/kbsequence.C
+src/language.C
+src/LaTeX.C
+src/LaTeXLog.C
+src/layout.C
+src/layout_forms.C
+src/LColor.C
+src/log_form.C
+src/LyXAction.C
+src/lyx.C
+src/lyx_cb.C
+src/lyxfont.C
+src/lyxfr0.C
+src/lyxfr1.C
+src/lyxfunc.C
+src/lyx_gui.C
+src/lyx_gui_misc.C
+src/lyx_main.C
+src/lyx_sendfax.C
+src/lyx_sendfax_main.C
+src/LyXSendto.C
+src/lyxvc.C
+src/LyXView.C
+src/mathed/formula.C
+src/mathed/formulamacro.C
+src/mathed/math_forms.C
+src/mathed/math_panel.C
+src/MenuBackend.C
+src/minibuffer.C
+src/paragraph.C
+src/print_form.C
+src/spellchecker.C
+src/sp_form.C
+src/support/filetools.C
+src/support/getUserName.C
+src/support/path.C
+src/support/path.h
+src/tabular.C
+src/text2.C
+src/text.C