diff --git a/.gitignore b/.gitignore
index 130181b..200e663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 DateTime-Format-Mail-0.3001.tar.gz
+/DateTime-Format-Mail-0.401.tar.gz
diff --git a/.rpmlint b/.rpmlint
new file mode 100644
index 0000000..7b97fad
--- /dev/null
+++ b/.rpmlint
@@ -0,0 +1,2 @@
+from Config import *
+addFilter("spelling-error .* programmatically");
diff --git a/perl-DateTime-Format-Mail.spec b/perl-DateTime-Format-Mail.spec
index b435053..3781237 100644
--- a/perl-DateTime-Format-Mail.spec
+++ b/perl-DateTime-Format-Mail.spec
@@ -1,27 +1,36 @@
-Name:           perl-DateTime-Format-Mail
-Version:        0.3001
-Release:        21%{?dist}
-Summary:        Convert between DateTime and RFC2822/822 formats
+%global cpan_version 0.401
 
+Name:           perl-DateTime-Format-Mail
+Epoch:          1
+Version:        %{cpan_version}.0
+Release:        1%{?dist}
+Summary:        Convert between DateTime and RFC2822/822 formats
 Group:          Development/Libraries
 License:        GPL+ or Artistic        
 URL:            http://search.cpan.org/dist/DateTime-Format-Mail            
-Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-Format-Mail-%{version}.tar.gz        
-
+Source0:        http://search.cpan.org/CPAN/authors/id/B/BO/BOOK/DateTime-Format-Mail-%{cpan_version}.tar.gz        
 BuildArch:      noarch
-BuildRequires:  perl(Class::ISA)
-BuildRequires:  perl(Module::Build), perl(DateTime) 
-BuildRequires:  perl(Params::Validate) >= 0.67, perl(Test::More) >= 0.47
-BuildRequires:  perl(File::Find::Rule)
-
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.30
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Run-time:
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(DateTime) >= 0.18
+BuildRequires:  perl(Params::Validate)
+BuildRequires:  perl(vars)
+# Tests:
+BuildRequires:  perl(File::Spec)
+# Pod::Coverage::TrustPod not used
+# Test::CPAN::Meta not used
+BuildRequires:  perl(Test::More) >= 0.88
+# Test::Pod 1.41 not used
+# Test::Pod::Coverage 1.08 not used
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 # DateTime >= 0.1705 plays havoc with rpm's versioning system
 Requires:       perl(DateTime) >= 0.18
-%{?filter_setup:
-%filter_from_requires s/^perl(DateTime).*/d
-%{?perl_default_filter}
-}
+
+# Remove under-specified dependencies
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(DateTime\\)
 
 %description
@@ -35,44 +44,31 @@ is more limited, and thus easier to parse programmatically.
 Despite the ease of generating and parsing perfectly valid RFC822 and RFC2822
 people still get it wrong. This module aims to correct that.
 
-
 %prep
-%setup -q -n DateTime-Format-Mail-%{version}
-
-gzip -c t/sample_dates >t/sample_dates.gz
-
-# POD doesn't like E<copy> very much...
-perl -pi -e 's/E<copy>/(C)/' `find lib/ -type f`
-
+%setup -q -n DateTime-Format-Mail-%{cpan_version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-# American English, bitte
-mv LICENCE LICENSE
-
 %install
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 %{_fixperms} %{buildroot}/*
 
-
 %check
-# we don't have a SIGNATURE, regardless of perl(Test::Signature) being around
-rm t/00signature.t
-
 make test
 
-
 %files
-%doc Artistic COPYING LICENSE Changes AUTHORS README CREDITS 
-%doc t/sample_dates.gz t/invalid.t
+%doc CREDITS Changes LICENSE README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Fri Dec 05 2014 Petr Pisar <ppisar@redhat.com> - 1:0.401.0-1
+- 0.401 bump
+
 * Fri Aug 29 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.3001-21
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index 710684f..ac30f65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15e36249e866463bd0237262a8e43b16  DateTime-Format-Mail-0.3001.tar.gz
+98f4d4d9dc17af5dcb3b3c79314ccc96  DateTime-Format-Mail-0.401.tar.gz