diff --git a/perl-IPC-Run.spec b/perl-IPC-Run.spec
index 9bda959..b5e159a 100644
--- a/perl-IPC-Run.spec
+++ b/perl-IPC-Run.spec
@@ -1,8 +1,6 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-IPC-Run
 Version:        0.78
-Release:        1
+Release:        2
 Summary:        Perl module for interacting with child processes
 
 License:        GPL or Artistic
@@ -13,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(IO::Tty)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 IPC::Run allows you run and interact with child processes using files,
@@ -27,28 +26,25 @@ and DOS command lines are provided.
 %setup -q -n IPC-Run-%{version}
 chmod 644 lib/IPC/*.pm lib/IPC/Run/*.pm Changes
 
-# Create our own find-requires to avoid some nasty Win32 specific dependencies.
-%define _use_internal_dependency_generator 0
-cat <<EOF > %{name}-findreq
+# Create our own find-requires to avoid some Win32 specific dependencies.
+cat <<EOF > %{name}-perlreq
 #!/bin/sh
 %{__find_requires} | grep -v 'perl(Win32'
 EOF
-%define __find_requires %{_builddir}/IPC-Run-%{version}/%{name}-findreq
-chmod +x %{__find_requires}
+%define __perl_requires %{_builddir}/IPC-Run-%{version}/%{name}-perlreq
+chmod +x %{__perl_requires}
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+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 -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
@@ -69,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr  2 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.78-2
+- Sync with fedora-rpmdevtools' Perl spec template.
+- Improve dependency filtering script.
+
 * Sun Mar 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.78-0.fdr.1
 - Update to 0.78.