diff --git a/ChangeLog b/ChangeLog
index 246c54329..33ad27bf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-02  Keith Packard  <keithp@keithp.com>
+
+	* hw/xwin/Makefile.am:
+	Mark generated files as BUILT_SOURCES and CLEANFILES
+	to ensure they are regenerated after 'make clean' and
+	to make parallel builds work right.
+
 2005-08-01  Keith Packard  <keithp@keithp.com>
 
 	* hw/dmx/config/Makefile.am:
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 97ca53fbb..0144a1b8d 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -140,6 +140,9 @@ XWin_LDFLAGS = -mwindows -static
 winprefsyacc.h: winprefsyacc.c
 winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h
 
+BUILT_SOURCES = winprefsyacc.h winprefsyacc.c winprefslex.c
+CLEANFILES = $(BUILT_SOURCES)
+
 AM_YFLAGS = -d
 AM_LFLAGS = -i
 AM_CFLAGS = -DHAVE_XWIN_CONFIG_H \