diff --git a/perl-Frontier-RPC.spec b/perl-Frontier-RPC.spec
index 118323d..7befd3f 100644
--- a/perl-Frontier-RPC.spec
+++ b/perl-Frontier-RPC.spec
@@ -11,19 +11,30 @@ Patch1:         perl-frontier-raw-serve.patch
 Patch2:         perl-frontier-undef-scalar.patch
 Patch3:         security-xml-external-entity.patch
 Patch4:         apache2.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(LWP::UserAgent), perl(XML::Parser), perl(ExtUtils::MakeMaker)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl-Frontier-RPC-doc
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
+# Run-time:
+# Apache2::Const not used at tests
+# Apache2::ServerUtil not used at tests
+BuildRequires:  perl(HTTP::Daemon)
+BuildRequires:  perl(HTTP::Request)
+BuildRequires:  perl(HTTP::Status)
+BuildRequires:  perl(LWP::UserAgent)
+BuildRequires:  perl(MIME::Base64)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
+BuildRequires:  perl(XML::Parser)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires:       perl-Frontier-RPC-doc = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %package Client
 Summary:        Frontier-RPC-Client Perl module
 Group:          Development/Libraries
 License:        GPL+ or Artistic
-Requires:       perl-Frontier-RPC-doc
+Requires:       perl-Frontier-RPC-doc = %{?epoch:%{epoch}:}%{version}-%{release}
 
-# fix conflicts between those two packages
+# To solve conflicts between those two packages
 %package doc
 Summary:        Frontier-RPC-Client Perl module documentation
 Group:          Development/Libraries
@@ -53,45 +64,32 @@ Documentation and examples to Frontier::RPC and Frontier::RPC::Client.
 %patch4 -p1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make pure_install DESTDIR=$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 \;
-
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{perl_vendorlib}/*
 
 %files Client
-%defattr(-,root,root,-)
 %{perl_vendorlib}/Frontier/Client.pm
 %{perl_vendorlib}/Frontier/RPC2.pm
 
 %files doc
-%defattr(-,root,root,-)
 %doc ChangeLog Changes COPYING README examples/
 %{_mandir}/man3/*
 
 %changelog
 * Mon Apr 07 2014 Petr Pisar <ppisar@redhat.com> - 0.07b4p1-20
-- Rebase perl-frontier-raw-call.patch to suppress *.orig files
-- Rebase perl-frontier-undef-scalar.patch to suppress *.orig files
-- Rebase apache2.patch to suppress *.orig files
-- Rebase security-xml-external-entity.patch to suppress *.orig files
+- Rebase patches to suppress creating *.orig files
+- Modernize the spec file
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.07b4p1-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild