diff --git a/ChangeLog b/ChangeLog
index 44ed1d2918..0a9456a88d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-06-24  Benjamin Otte  <otte@gnome.org>
+
+	* gst-libs/gst/colorbalance/Makefile.am:
+	* gst-libs/gst/mixer/Makefile.am:
+	* gst-libs/gst/play/Makefile.am:
+	* gst-libs/gst/tuner/Makefile.am:
+	* gst/tcp/Makefile.am:
+	* sys/dxr3/Makefile.am:
+	  don't include -enumtypes.[ch] or -marshal.[ch] files in the disted
+	  tarball.
+	  Also add all *.list files that were missing.
+	* Makefile.am:
+	  add a distcheck hook to ensure the above doesn't happen again.
+
 2004-06-23  David I. Lehn  <dlehn@users.sourceforge.net>
 
 	* ext/Makefile.am: s/DTS_DIR=dvdread/DTS_DIR=dts/
diff --git a/Makefile.am b/Makefile.am
index 258a79c853..d773bc68a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,5 +44,13 @@ EXTRA_DIST=gst-plugins.spec depcomp \
 
 DISTCLEANFILES=_stdint.h
 
+# check that no marshal or enumtypes files are included
+# this in turn ensures that distcheck fails for missing .list files which is currently
+# shadowed when the corresponding .c and .h files are included.
+distcheck-hook:
+	test "x" = "x`find $(distdir) -name \*-enumtypes.[ch]`" && \
+	test "x" = "x`find $(distdir) -name \*-marshal.[ch]`" || \
+	( $(ECHO) "*** Still leftover enumtypes or marshal files in the tarball. Please make sure those are not disted." && false )
+
 include $(top_srcdir)/common/release.mak
 include $(top_srcdir)/common/po.mak
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index a410ad3233..e7cf3d8c61 100644
--- a/gst-libs/gst/colorbalance/Makefile.am
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -18,7 +18,9 @@ built_headers =	\
 	colorbalance-marshal.h \
 	colorbalance-enumtypes.h
 
-libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers) \
+libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers)
+
+nodist_libgstcolorbalanceinclude_HEADERS = \
 	colorbalance-enumtypes.h
 
 noinst_LTLIBRARIES = libgstcolorbalance.la
@@ -26,6 +28,7 @@ noinst_LTLIBRARIES = libgstcolorbalance.la
 libgstcolorbalance_la_SOURCES = \
 	colorbalance.c \
 	colorbalancechannel.c
+
 nodist_libgstcolorbalance_la_SOURCES = \
         $(built_sources) \
 	colorbalance-marshal.h
diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index e556ab0ef4..e5abf68768 100644
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -21,8 +21,11 @@ built_headers =	\
 	mixer-enumtypes.h
 
 libgstmixerinclude_HEADERS = \
-	$(mixer_headers) \
-	mixer-enumtypes.h
+	$(mixer_headers) 
+
+# FIXME 0.9: don't include marshal files
+nodist_libgstmixerinclude_HEADERS = \
+	$(built_headers)
 
 noinst_LTLIBRARIES = libgstmixer.la
 
@@ -32,7 +35,6 @@ libgstmixer_la_SOURCES = \
 	mixertrack.c
 
 nodist_libgstmixer_la_SOURCES = \
-	mixer-marshal.h \
 	$(built_sources)
 
 libgstmixer_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am
index ad2ca4580f..ef17d46173 100644
--- a/gst-libs/gst/play/Makefile.am
+++ b/gst-libs/gst/play/Makefile.am
@@ -13,10 +13,11 @@ built_headers = \
 
 library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la
 
-libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c play-enumtypes.c
+libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c 
+nodist_libgstplay_@GST_MAJORMINOR@_la_SOURCES = play-enumtypes.c
 
 libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play
-libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers)
+libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) 
 
 libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS)
 libgstplay_@GST_MAJORMINOR@_la_LIBADD =	\
diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am
index c5c4e5e49a..804e33db8b 100644
--- a/gst-libs/gst/tuner/Makefile.am
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -20,7 +20,10 @@ built_headers =	\
 	tuner-enumtypes.h
 
 libgsttunerinclude_HEADERS = \
-	$(tuner_headers) \
+	$(tuner_headers)
+
+# FIXME 0.9: don't install
+nodist_libgsttunerinclude_HEADERS = \
 	tuner-enumtypes.h
 
 noinst_LTLIBRARIES = libgsttuner.la
@@ -29,6 +32,7 @@ libgsttuner_la_SOURCES = \
 	tuner.c \
 	tunernorm.c \
 	tunerchannel.c
+
 nodist_libgsttuner_la_SOURCES = \
 	$(built_sources) \
 	tuner-marshal.h
diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index cd4736ada2..98b8ca75ef 100644
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -15,18 +15,19 @@ BUILT_SOURCES = $(built_sources) $(built_headers)
 libgsttcp_la_SOURCES = \
 	gsttcpplugin.c \
 	gsttcpsrc.c gsttcpsink.c \
-	$(built_sources) \
 	gsttcp.c \
 	gsttcpclientsrc.c gsttcpclientsink.c \
 	gsttcpserversrc.c gsttcpserversink.c
 
+nodist_libgsttcp_la_SOURCES = \
+	$(built_sources)
+
 # remove ENABLE_NEW when dataprotocol is stable
 libgsttcp_la_CFLAGS = $(GST_CFLAGS) -DGST_ENABLE_NEW
 libgsttcp_la_LIBADD =
 libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = \
-  $(built_headers) \
   gsttcpplugin.h \
   gsttcpsrc.h gsttcpsink.h \
   gsttcp.h \
@@ -34,3 +35,6 @@ noinst_HEADERS = \
   gsttcpserversrc.h gsttcpserversink.h
 
 CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = gsttcp-marshal.list
+