diff --git a/Makefile.am b/Makefile.am
index 7c1a4bd4db..82de45f144 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,29 +14,6 @@ EXTRA_DIST = \
 	gst-python.spec.in \
 	gst-python.spec \
 	README-docs \
-	RELEASE \
-	examples/gst/bps.py \
-	examples/gst/cp.py \
-	examples/gst/dvdplay.py \
-	examples/gst/f2f.py \
-	examples/gst/identity.py \
-	examples/gst/ilat.py \
-	examples/gst/lat.py \
-	examples/gst/rot13.py \
-	examples/gst/vorbisplay.py \
-	examples/gst/wavenc.py \
-	examples/gstplay/player.py \
-        codegen/__init__.py \
-        codegen/argtypes.py \
-        codegen/codegen.py \
-        codegen/definitions.py \
-        codegen/defsparser.py \
-        codegen/docextract.py \
-        codegen/docgen.py \
-        codegen/h2def.py \
-        codegen/mergedefs.py \
-        codegen/mkskel.py \
-        codegen/override.py \
-        codegen/scmexpr.py
+	RELEASE
 
 include $(top_srcdir)/common/release.mak
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 062cb55aab..e228a745dd 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1 +1,3 @@
-SUBDIRS = gst
+SUBDIRS = \
+	gst \
+	gstplay
diff --git a/examples/gst/Makefile.am b/examples/gst/Makefile.am
index ccad923a6d..9a05d476e5 100644
--- a/examples/gst/Makefile.am
+++ b/examples/gst/Makefile.am
@@ -1,4 +1,5 @@
-EXTRA_DIST = \
+examplesdir = $(pkgdatadir)/examples
+examples_DATA = 	\
 	bps.py		\
 	cp.py		\
 	f2f.py		\
@@ -6,3 +7,5 @@ EXTRA_DIST = \
 	gst123		\
 	play.py		\
 	vorbisplay.py
+
+EXTRA_DIST = $(examples)
diff --git a/gst/gst.override b/gst/gst.override
index c9f128ec7b..b0c3f8a1f4 100644
--- a/gst/gst.override
+++ b/gst/gst.override
@@ -1168,6 +1168,9 @@ _wrap_gst_registry_pool_feature_list(PyGObject *self, PyObject *args)
 %%
 override gst_xml_new noargs
 
+extern PyObject * libxml_xmlDocPtrWrap(xmlDocPtr doc);
+extern PyObject * libxml_xmlNodePtrWrap(xmlNodePtr node);
+ 
 /* libxml2 available check */
 static PyObject *
 _gst_get_libxml2_module(void)