diff --git a/.cvsignore b/.cvsignore
index c3214a8..84f8e63 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libgpod-0.4.0.tar.gz
+libgpod-0.5.2.tar.gz
diff --git a/libgpod-0.5.2-python-docs.patch b/libgpod-0.5.2-python-docs.patch
new file mode 100644
index 0000000..2e9cbcb
--- /dev/null
+++ b/libgpod-0.5.2-python-docs.patch
@@ -0,0 +1,17 @@
+--- bindings/python/Makefile.in~	2007-06-23 01:51:57.000000000 -0400
++++ bindings/python/Makefile.in	2007-07-11 16:58:38.000000000 -0400
+@@ -752,9 +752,11 @@
+ 
+ @HAVE_PYTHON_TRUE@gpod_doc.i: $(srcdir)/gpod_doc.i.in $(srcdir)/gtkdoc-to-swig.xsl
+ @HAVE_PYTHON_TRUE@	cat $< > $@
+-@ENABLE_GTK_DOC_TRUE@@HAVE_PYTHON_TRUE@	-for xml in $(top_srcdir)/docs/reference/xml/*.xml; do \
+-@ENABLE_GTK_DOC_TRUE@@HAVE_PYTHON_TRUE@	    xsltproc $(srcdir)/gtkdoc-to-swig.xsl $$xml; \
+-@ENABLE_GTK_DOC_TRUE@@HAVE_PYTHON_TRUE@	done >> $@
++@HAVE_PYTHON_TRUE@	-if test -x "`which xsltproc 2>/dev/null`"; then \
++@HAVE_PYTHON_TRUE@	    for xml in $(top_srcdir)/docs/reference/xml/*.xml; do \
++@HAVE_PYTHON_TRUE@		xsltproc $(srcdir)/gtkdoc-to-swig.xsl $$xml; \
++@HAVE_PYTHON_TRUE@	    done >> $@; \
++@HAVE_PYTHON_TRUE@	fi
+ 
+ @HAVE_PYTHON_TRUE@gpod_wrap.c: $(SWIG_INTERFACES) $(nodist_gpod_PYTHON)
+ @HAVE_PYTHON_TRUE@	$(SWIG) -python $(INCLUDES) -o $@ $<
diff --git a/libgpod.spec b/libgpod.spec
index 168b9da..02355f7 100644
--- a/libgpod.spec
+++ b/libgpod.spec
@@ -1,16 +1,23 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: Library to access the contents of an iPod
 Name: libgpod
-Version: 0.4.2
+Version: 0.5.2
 Release: 1%{?dist}
-License: LGPL
+License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
-Source: http://prdownloads.sf.net/gtkpod/libgpod-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz
+Patch0: libgpod-0.5.2-python-docs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: gettext
+BuildRequires: libxslt
 BuildRequires: perl(XML::Parser)
+Buildrequires: python-devel
+Buildrequires: python-mutagen
+Buildrequires: swig
 
 %description
 Libgpod is a library to access the contents of an iPod. It supports playlists,
@@ -31,32 +38,53 @@ This package contains the files required to develop programs that will use
 libgpod.
 
 
+%package -n python-gpod
+Summary: Python module to access iPod content
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+Requires: python-mutagen
+
+%description -n python-gpod
+A python module to access iPod content.  This module provides bindings to the
+libgpod library.
+
+
 %prep
-%setup
+%setup -q
+%patch0 -p0 -b .pydocs
+
+# remove execute perms on the python examples as they'll be installed in %doc
+%{__chmod} -x bindings/python/examples/*.py
 
 
 %build
-%configure --without-python
+%configure
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} DESTDIR=%{buildroot} install
 %find_lang %{name}
 
+# remove Makefiles from the python examples dir
+%{__rm} -rf bindings/python/examples/Makefile*
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING README
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-, root, root, 0755)
 %{_includedir}/gpod-1.0/
@@ -67,7 +95,22 @@ libgpod.
 %{_libdir}/*.so
 
 
+%files -n python-gpod
+%doc COPYING bindings/python/README bindings/python/examples
+%{python_sitearch}/gpod
+%exclude %{python_sitearch}/gpod/*.a
+%exclude %{python_sitearch}/gpod/*.la
+
+
 %changelog
+* Sat Aug 04 2007 Todd Zullinger <tmz@pobox.com> - 0.5.2-1
+- update to 0.5.2
+- replace %%makeinstall with %%{__make} DESTDIR=%%{buildroot} install
+- build python bindings, merging python-gpod package from extras
+- make %%setup quiet
+- patch to fixup building of the python docs, BR libxslt
+- update license tag
+
 * Tue Jan 16 2007 Alexander Larsson <alexl@redhat.com> - 0.4.2-1
 - update to 0.4.2
 - Change %%description to reflect newer features
diff --git a/sources b/sources
index 405138a..1be6910 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3c031dc6f1f6eff422598c84f2621bd  libgpod-0.4.2.tar.gz
+e4f8d2a7be9512268267bfbe712fe9be  libgpod-0.5.2.tar.gz