diff --git a/0001-Install-python-bindings-in-the-arch-specific-locatio.patch b/0001-Install-python-bindings-in-the-arch-specific-locatio.patch
new file mode 100644
index 0000000..0488a1e
--- /dev/null
+++ b/0001-Install-python-bindings-in-the-arch-specific-locatio.patch
@@ -0,0 +1,35 @@
+From feff3aad50304450248aa66aed59d09439699234 Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Wed, 12 Jan 2011 15:01:52 -0500
+Subject: [PATCH] Install python bindings in the arch-specific location
+
+---
+ buildtools/wafsamba/samba_python.py |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
+index a663b1910d063336c1340142ae8855d7e176ecdb..9b72f3fd112288a022a2de0701594814616f202f 100644
+--- a/buildtools/wafsamba/samba_python.py
++++ b/buildtools/wafsamba/samba_python.py
+@@ -51,6 +51,9 @@ def SAMBA_PYTHON(bld, name,
+ 
+     link_name = 'python/%s' % realname
+ 
++    from distutils.sysconfig import get_python_lib
++    arch_install_dir = get_python_lib(1)
++
+     bld.SAMBA_LIBRARY(name,
+                       source=source,
+                       deps=deps,
+@@ -63,7 +66,7 @@ def SAMBA_PYTHON(bld, name,
+                       link_name=link_name,
+                       pyembed=True,
+                       target_type='PYTHON',
+-                      install_path='${PYTHONDIR}',
++                      install_path=arch_install_dir,
+                       enabled=enabled)
+ 
+ Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON
+-- 
+1.7.3.4
+
diff --git a/libtevent.spec b/libtevent.spec
index a7ce375..60a6f08 100644
--- a/libtevent.spec
+++ b/libtevent.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: libtevent
-Version: 0.9.8
-Release: 7.1%{?dist}
+Version: 0.9.10
+Release: 1%{?dist}
 Group: System Environment/Daemons
 Summary: The tevent library
 License: LGPLv3+
@@ -8,36 +14,44 @@ URL: http://tevent.samba.org/
 Source: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Patch1: tevent-098-add_abi_scripts_and_fix_exports.patch
-Patch3: tevent_signal_segfault.patch
+BuildRequires: libtalloc-devel >= 2.0.5
+BuildRequires: python-devel
 
-BuildRequires: libtalloc-devel >= 2.0.0
+# Patches
+Patch0001: 0001-Install-python-bindings-in-the-arch-specific-locatio.patch
 
 %description
 Tevent is an event system based on the talloc memory management library.
 Tevent has support for many event types, including timers, signals, and
 the classic file descriptor events.
 Tevent also provide helpers to deal with asynchronous code providing the
-tevent_req (Tevent Request) functions. 
+tevent_req (Tevent Request) functions.
 
 %package devel
 Group: Development/Libraries
 Summary: Developer tools for the Tevent library
 Requires: libtevent = %{version}-%{release}
-Requires: libtalloc-devel >= 2.0.0
+Requires: libtalloc-devel >= 2.0.5
 Requires: pkgconfig
 
 %description devel
 Header files needed to develop programs that link against the Tevent library.
 
+
+%package -n python-tevent
+Group: Development/Libraries
+Summary: Python bindings for the Tevent library
+Requires: libtevent = %{version}-%{release}
+
+%description -n python-tevent
+Python bindings for libtevent
+
 %prep
 %setup -q -n tevent-%{version}
-
-%patch1 -p1 -b .abi_checks
-%patch3 -p1 -b .tevent_signal_segv
+%patch0001 -p1
 
 %build
-%configure
+%configure --disable-rpath --bundled-libraries=NONE
 make %{?_smp_mflags}
 
 %install
@@ -45,9 +59,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-ln -s libtevent.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so.0
-ln -s libtevent.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtevent.a
 
 %clean
@@ -63,11 +74,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libtevent.so
 %{_libdir}/pkgconfig/tevent.pc
 
+%files -n python-tevent
+%defattr(-,root,root,-)
+%{python_sitearch}/_tevent.so
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 12 2011 Stephen Gallagher <sgallagh@redhat.com> - 0.9.10-1
+- New upstream release
+- Convert to new WAF build-system
+
 * Wed Feb 24 2010 Stephen Gallagher <sgallagh@redhat.com> - 0.9.8-7.1
 - Bump revision to chain-build libtevent, samba4 and sssd
 
@@ -81,4 +100,4 @@ rm -rf $RPM_BUILD_ROOT
 - Fix abi compatibility with 0.9.3
 
 * Sat Sep 8 2009 Simo Sorce <ssorce@redhat.com> - 0.9.8-1
-- First independent release for tevent 0.9.8 
+- First independent release for tevent 0.9.8