diff --git a/perl-BDB.spec b/perl-BDB.spec
index a6c8934..b3cb6a1 100644
--- a/perl-BDB.spec
+++ b/perl-BDB.spec
@@ -5,62 +5,45 @@ Name:           perl-BDB
 Version:        %{cpan_version}0
 Release:        6%{?dist}
 Summary:        Asynchronous Berkeley DB access
-
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/BDB/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/BDB-%{cpan_version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRequires:  libdb-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(base)
 BuildRequires:  perl(common::sense)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(XSLoader)
-BuildRequires:  libdb-devel
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:  perl(XSLoader)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(XSLoader)
 
 %{?perl_default_filter}
 
 %description
 Asynchronous Berkeley DB access.
 
-
 %prep
-%setup -q -n BDB-%{cpan_version}
-
+%setup -qn BDB-%{cpan_version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 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 -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+chmod -R u+w %{buildroot}/*
 
 %check
 make test
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes COPYING README
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/BDB.pm
 %{_mandir}/man3/*.3*
 
-
 %changelog
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.90-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild