diff --git a/ChangeLog b/ChangeLog
index 018cebc373..28596a39b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-03-04  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	* examples/Makefile.am:
+	* gst/Makefile.am:
+	* gstinterfaces/Makefile.am:
+	* gstplay/Makefile.am:
+	* testsuite/Makefile.am:
+          fix make distcheck
+          move examples/gstreamer to examples/gst
+
 2004-03-04  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* Makefile.am:
diff --git a/configure.ac b/configure.ac
index 36f88db034..b37ba5fbed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,7 @@ AC_OUTPUT([
   pkgconfig/gst-python.pc
   pkgconfig/gst-python-uninstalled.pc
   examples/Makefile
-  examples/gstreamer/Makefile
+  examples/gst/Makefile
   docs/Makefile
   docs/gst-python.ent
   testsuite/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 875ebcea6a..062cb55aab 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gstreamer
+SUBDIRS = gst
diff --git a/gst/Makefile.am b/gst/Makefile.am
index fb30349f92..4efe8d7b6b 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -24,14 +24,14 @@ _gstmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gst
 nodist__gstmodule_la_SOURCES = gst.c
 
 CLEANFILES = gst.c
-EXTRA_DIST = gst.defs $(GST_OVERRIDES) arg-types.py
+EXTRA_DIST = gst.defs gst-types.defs $(GST_OVERRIDES) arg-types.py
 
 gst.c: $(srcdir)/gst.defs $(srcdir)/arg-types.py $(GST_OVERRIDES)
 	$(PYGTK_CODEGEN) \
 		--load-types $(srcdir)/arg-types.py \
 	        --register $(srcdir)/gst-types.defs \
 		--override $(srcdir)/gst.override \
-		--prefix pygst gst.defs > gen-gst.c \
+		--prefix pygst $(srcdir)/gst.defs > gen-gst.c \
         && rm -fr gtreamer.c \
         && echo '/* GENERATED FILE - DO NOT EDIT */' >> gst.c \
 	&& cat gen-gst.c >> gst.c \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4682a8bc54..c70a1be1ff 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -3,3 +3,5 @@ testprogs = element.py
 TESTS = $(testprogs)
 
 check_SCRIPTS = $(testprogs)
+
+EXTRA_DIST = $(testprogs)