diff --git a/gstreamer-python.spec b/gstreamer-python.spec
index 5fde794..6f58ac6 100644
--- a/gstreamer-python.spec
+++ b/gstreamer-python.spec
@@ -2,7 +2,7 @@
 
 Name:           gstreamer-python
 Version:        0.10.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
@@ -36,19 +36,22 @@ to be written in Python.
 
 %prep
 %setup -q -n gst-python-%{version}
+%{__sed} -i 's|^#!/usr/bin/env python$|#|' gst/extend/*.py
 
 
 %build
-# the "docs" were built when disting the tarball, so we don't need to
-# rebuild them
-%configure --disable-docs
+%configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT docs-to-include
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+mkdir -p docs-to-include/examples
+chmod -x examples/*.py
+cp examples/*.py docs-to-include/examples/
+rm -fr $RPM_BUILD_ROOT%{_datadir}/gst-python/%{majorminor}/examples
 
 
 %clean
@@ -58,17 +61,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%doc examples/*.py
+%doc docs-to-include/*
 %{_libdir}/python?.?/site-packages/gst-%{majorminor}
 %{_libdir}/python?.?/site-packages/pygst.py*
 %{_libdir}/python?.?/site-packages/pygst.pth
 %dir %{_datadir}/gst-python
-%{_datadir}/gst-python/%{majorminor}/examples
 %{_datadir}/gst-python/%{majorminor}/defs/*.defs
 %{_libdir}/pkgconfig/gst-python-%{majorminor}.pc
 
 
 %changelog
+* Tue Feb 20 2007 Denis Leroy <denis@poolshark.org> - 0.10.7-2
+- Ship examples in doc directory only, fixes multilib conflict (#228363)
+- rpmlint cleanup
+
 * Wed Feb 14 2007 Denis Leroy <denis@poolshark.org> - 0.10.7-1
 - Update to 0.10.7
 - Some spec cleanups