diff --git a/.gitignore b/.gitignore
index c29bb86..da93829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 talloc-2.0.1.tar.gz
+/talloc-2.0.5.tar.gz
diff --git a/libtalloc.spec b/libtalloc.spec
index 80736c1..d913b02 100644
--- a/libtalloc.spec
+++ b/libtalloc.spec
@@ -1,6 +1,12 @@
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print(get_python_version())")}
+
 Name: libtalloc
-Version: 2.0.1
-Release: 1%{?dist}
+Version: 2.0.5
+Release: 3%{?dist}
 Group: System Environment/Daemons
 Summary: The talloc library
 License: LGPLv3+
@@ -11,6 +17,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: autoconf
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
+BuildRequires: python-devel
 
 %description
 A library that implements a hierarchical allocator with destructors.
@@ -23,13 +30,29 @@ Requires: libtalloc = %{version}-%{release}
 %description devel
 Header files needed to develop programs that link against the Talloc library.
 
+%package -n pytalloc
+Group: Development/Libraries
+Summary: Developer tools for the Talloc library
+Requires: libtalloc = %{version}-%{release}
+
+%description -n pytalloc
+Pytalloc libraries for creating python bindings using talloc
+
+%package -n pytalloc-devel
+Group: Development/Libraries
+Summary: Developer tools for the Talloc library
+Requires: pytalloc = %{version}-%{release}
+
+%description -n pytalloc-devel
+Development libraries for pytalloc
+
+
 %prep
 %setup -q -n talloc-%{version}
 
 %build
 ./autogen.sh
-#%configure --enable-talloc-compat1
-%configure
+%configure --disable-rpath --bundled-libraries=NONE
 make %{?_smp_mflags}
 
 %install
@@ -37,15 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.2
-ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
-
-#Compatibility library
-#ln -s libtalloc-compat1-2.0.0.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.a
 rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i
 
+# Work around incorrect build-system location
+mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}
+mv $RPM_BUILD_ROOT/usr/lib/python%{python_version}/site-packages/talloc.so \
+   $RPM_BUILD_ROOT/%{python_sitearch}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +74,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libtalloc.so.*
-#%{_libdir}/libtalloc-compat1-2.0.0.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -62,6 +82,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/talloc.pc
 %{_mandir}/man3/talloc.3.gz
 
+%files -n pytalloc
+%defattr(-,root,root,-)
+%{_libdir}/libpytalloc-util.so.*
+%{python_sitearch}/talloc.so
+
+%files -n pytalloc-devel
+%defattr(-,root,root,-)
+%{_includedir}/pytalloc.h
+%{_libdir}/pkgconfig/pytalloc-util.pc
+%{_libdir}/libpytalloc-util.so
+
 %post
 /sbin/ldconfig
 
@@ -69,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 %changelog
+* Tue Jan 11 2011 Stephen Gallagher <sgallagh@redhat.com> - 2.0.5-3
+- New version from upstream
+- Add support for pytalloc
+- Convert to new WAF build-system
+
 * Tue Dec 15 2009 Simo Sorce <ssorce@redhat.com> - 2.0.1-1
 - New version from upstream
 - Also stop building the compat lib, it is not necessary anymore
diff --git a/sources b/sources
index 24f864a..f55caa2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6e736540145ca58cb3dcb42f91cf57b  talloc-2.0.1.tar.gz
+6e3fdfbc43dde8ccba27b6af894b8fb2  talloc-2.0.5.tar.gz