diff --git a/.cvsignore b/.cvsignore
index 1c0d24f..0246514 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-MailTools-1.61.tar.gz
+MailTools-1.64.tar.gz
diff --git a/perl-MailTools-testfile.patch b/perl-MailTools-testfile.patch
deleted file mode 100644
index 76c828e..0000000
--- a/perl-MailTools-testfile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Mail/Mailer.pm~	2004-03-10 11:52:15.000000000 +0200
-+++ Mail/Mailer.pm	2004-03-20 18:08:03.000000000 +0200
-@@ -49,7 +49,7 @@
- 
- Use qmail's qmail-inject program to deliver the mail.
- 
--=item C<test>
-+=item C<testfile>
- 
- Used for debugging, this displays the data on STDOUT.  No mail is ever
- sent.  C<$command> is ignored.
-@@ -140,7 +140,7 @@
- 
-     'smtp'	=> undef,
-     'qmail'     => '/usr/sbin/qmail-inject;/var/qmail/bin/qmail-inject',
--    'test'	=> undef
-+    'testfile'	=> undef
- );
- 
- if($ENV{PERL_MAILERS})
diff --git a/perl-MailTools.spec b/perl-MailTools.spec
index 9807ae4..a882897 100644
--- a/perl-MailTools.spec
+++ b/perl-MailTools.spec
@@ -1,26 +1,26 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-%define		tarname	MailTools
 
-Summary: 	MailTools module for Perl
-Name: 		perl-%{tarname}
-Version: 	1.61
-Release: 	0.fdr.2.rh90
-Epoch: 		0
-License: 	Artistic
-Group: 		Development/Libraries
-URL: 		http://search.cpan.org/dist/MailTools/
-Source0: 	%{tarname}-%{version}.tar.gz
-Patch0:         %{name}-testfile.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+Summary:        MailTools module for Perl
+Name:           perl-MailTools
+Version:        1.64
+Release:        0.fdr.1.1
+Epoch:          0
+License:        Artistic
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/MailTools/
+Source0:        http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.64.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 MailTools is a set of Perl modules related to mail applications.
 
 
 %prep
-%setup -q -n %{tarname}-%{version}
-%patch0 -p0
+%setup -q -n MailTools-%{version}
 
 
 %build
@@ -30,11 +30,8 @@ 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 \) -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 d -depth -exec rmdir {} 2>/dev/null ';'
 
 
@@ -48,13 +45,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README* examples ChangeLog
-%{perl_vendorlib}/auto/Mail
-%{perl_vendorlib}/Mail
+%doc ChangeLog README* examples/
+%{perl_vendorlib}/auto/Mail/
+%{perl_vendorlib}/Mail/
 %{_mandir}/man3/Mail::*.3pm*
 
 
 %changelog
+* Wed Aug 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.64-0.fdr.1
+- Update to 1.64, patch applied upstream.
+- Bring up to date with current fedora.us Perl spec template.
+
 * Sat Mar 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.61-0.fdr.2
 - Add patch to complete test.pm -> testfile.pm change introduced in 1.61.
 
diff --git a/sources b/sources
index 09d108d..3934a40 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c4fae5d578d381ed2996fd30886d2a8  MailTools-1.61.tar.gz
+e417665e33aa1e9b00642c300e92ed06  MailTools-1.64.tar.gz