diff --git a/config/ChangeLog b/config/ChangeLog
index 1216dedb8e..c40ad121c9 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-30  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* common.am: improve pch handling a tiny bit
+
 2004-08-15  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* lyxinclude.m4 (lyx_pch_comp,LYX_BUILD_PCH): set this for
diff --git a/config/common.am b/config/common.am
index 69ebe4bef1..4c2e880625 100644
--- a/config/common.am
+++ b/config/common.am
@@ -11,10 +11,10 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
 AM_ETAGSFLAGS = --lang=c++
 
 if LYX_BUILD_PCH
-PCH_FLAGS = -Winvalid-pch --include=pch.h
+PCH_FLAGS = -Winvalid-pch --include=./pch.h
 PCH_FILE = ./pch.h.gch
 PCH_SOURCE = ./pch.h
-sinclude pch.h.gch.dep
+sinclude ./pch.h.gch.dep
 
 *.C *.cpp: $(PCH_FILE)
 
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 1645e669f7..b76f33f7a1 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-30  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* forms/pch.h: make it better
+
+	* forms/Makefile.am (DISTCLEANFILES): only delete files we generated
+
 2004-08-15  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* pch.h: new file
diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am
index f9ce121761..2de4eb6f4a 100644
--- a/src/frontends/xforms/forms/Makefile.am
+++ b/src/frontends/xforms/forms/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += *.C *.h *.c
+DISTCLEANFILES += $(SRCS:.fd=.C) $(SRCS:.fd=.h) $(SRCS:.fd=.c)
 
 EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh tmp_str.sed README $(SRCS)
 
diff --git a/src/frontends/xforms/forms/pch.h b/src/frontends/xforms/forms/pch.h
index 38b64a24b0..be2ed7db71 100644
--- a/src/frontends/xforms/forms/pch.h
+++ b/src/frontends/xforms/forms/pch.h
@@ -1,10 +1,8 @@
 #include <config.h>
 
-#include "bmtable.h"
-#include "combox.h"
+#include "lyx_forms.h"
 #include "fdesign_base.h"
+#include "forms_gettext.h"
 #include "gettext.h"
 
-#include "../lyx_forms.h"
-
 #include <stdlib.h>