diff --git a/uuid.spec b/uuid.spec
index 71bd31e..d67a9e3 100644
--- a/uuid.spec
+++ b/uuid.spec
@@ -1,6 +1,9 @@
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+
 Name:           uuid
 Version:        1.6.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -62,8 +65,13 @@ Perl OSSP uuid modules, which includes a Data::UUID replacement.
 Summary:        PHP support for Universally Unique Identifier library
 Group:          Development/Libraries
 BuildRequires:  php-devel
-Requires:       %{_libdir}/php/modules
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?php_zend_api}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
+%else
+Requires: php-api = %{php_apiver}
+%endif
 
 %description php
 PHP OSSP uuid module.
@@ -126,11 +134,11 @@ popd
 
 # Build the PHP module.
 pushd php
+export PHP_RPATH=no
 phpize
 CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs"
 %configure --enable-uuid
-sed -i -e '/^LDFLAGS =/s/-Wl,-rpath,[^[:space:]]*//' Makefile
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+make %{?_smp_mflags}
 popd
 
 %install
@@ -154,9 +162,18 @@ popd
 # Install the PHP module.
 pushd php
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a
+rm -f $RPM_BUILD_ROOT%{php_extdir}/*.a
 popd
 
+# Put the php config bit into place
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
+%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini
+; Enable %{name} extension module
+extension=%{name}.so
+__EOF__
+
+
+
 %check
 make check
 
@@ -218,7 +235,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files php
 %defattr(-,root,root,-)
-%{_libdir}/php/modules/*
+%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
+%{php_extdir}/%{name}.so
 
 %files pgsql
 %defattr(-,root,root,-)
@@ -235,6 +253,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Mon Jul 13 2009 Remi Collet <Fedora@FamilleCollet.com> - 1.6.1-7
+- rebuild for new PHP 5.3.0 ABI (20090626)
+- add PHP ABI check
+- use php_extdir
+- add php configuration file (/etc/php.d/uuid.ini)
+
 * Thu May  7 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.6.1-6
 - Using plain old "Requires: pkgconfig" instead -- see my post to
   fedora-devel-list made today.