diff --git a/perl-Data-ObjectDriver.spec b/perl-Data-ObjectDriver.spec
index a7e3168..0c11635 100644
--- a/perl-Data-ObjectDriver.spec
+++ b/perl-Data-ObjectDriver.spec
@@ -1,12 +1,11 @@
 Name:           perl-Data-ObjectDriver
 Version:        0.09
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple, transparent data interface, with caching
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-ObjectDriver/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIXAPART/Data-ObjectDriver-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(DBI)
@@ -17,8 +16,8 @@ BuildRequires:  perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger)
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-%filter_requires_in %{perl_vendorlib}/Data/ObjectDriver/Driver/DBD/Oracle.pm
 %{?perl_default_filter}
+%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}%{perl_vendorlib}/Data/ObjectDriver/Driver/DBD/Oracle.pm
 
 %description
 Data::ObjectDriver is an object relational mapper, meaning that it maps object-
@@ -27,22 +26,11 @@ oriented design concepts onto a relational database.
 %prep
 %setup -q -n Data-ObjectDriver-%{version}
 
-# Filter unwanted Requires:
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-  sed -e '/perl(DBD::Oracle)/d'
-EOF
-
-%define __perl_requires %{_builddir}/Data-ObjectDriver-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
@@ -51,16 +39,17 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jun 21 2011 Iain Arnell <iarnell@gmail.com> 0.09-3
+- update filtering for rpm 4.9
+- clean up spec for modern rpmbuild
+
 * Tue Jun 21 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.09-2
 - Perl mass rebuild