diff --git a/.cvsignore b/.cvsignore
index f42d1fd..2785b31 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Date-Calc-5.3.tar.gz
+Date-Calc-5.4.tar.gz
diff --git a/perl-Date-Calc.spec b/perl-Date-Calc.spec
index 9c05c14..9e3db1b 100644
--- a/perl-Date-Calc.spec
+++ b/perl-Date-Calc.spec
@@ -1,15 +1,18 @@
-%define _use_internal_dependency_generator 0
-
-Name: perl-Date-Calc
-Version: 5.3
-Release: 11
-Summary: A module for extended and efficient date calculations in Perl.
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/search?mode=module&query=Date%3a%3aCalc
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl >= 0:5.00503
-Source0: Date-Calc-%{version}.tar.gz
+Name:           perl-Date-Calc
+Version:        5.4
+Release:        1
+Summary:        A module for extended and efficient date calculations in Perl
+
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/Date-Calc/
+Source0:  http://www.cpan.org/authors/id/S/ST/STBEY/Date-Calc-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl-Bit-Vector >= 6.4
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl-Bit-Vector >= 6.4
 
 %description
 The library provides all sorts of date calculations based on the
@@ -19,41 +22,45 @@ thereby complying with all relevant norms and standards: ISO/R
 
 %prep
 %setup -q -n Date-Calc-%{version} 
+%{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' examples/*.{pl,cgi} tools/*.pl
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
-make
-make test
-
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 %install
-
 rm -rf $RPM_BUILD_ROOT
-make install
+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/*
 
 file=$RPM_BUILD_ROOT%{_mandir}/man3/Date::Calc.3pm
 iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
 mv -f "${file}_" "$file"
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+%check || :
+make test
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" | \
-	grep -v perllocal.pod | \
-	grep -v "\.packlist" > Date-Calc-%{version}-filelist
-if [ "$(cat Date-Calc-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
+%files
+%defattr(-,root,root,-)
+%doc Artistic.txt GNU_GPL.txt GNU_LGPL.txt
+%doc CHANGES.txt CREDITS.txt README.txt
+%doc EXAMPLES.txt examples/ TOOLS.txt tools/
+%{perl_vendorarch}/Date/
+%{perl_vendorarch}/auto/Date/
+%{_mandir}/man3/*.3*
 
-%files -f Date-Calc-%{version}-filelist
-%defattr(-,root,root)
 
 %changelog
-* Wed Mar 30 2005 Warren Togami <wtogami@redhat.com>
-- remove brp-compress
+* Sat Apr  2 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 5.4-1
+- Update to 5.4.
+- Bring up to date with current Fedora.Extras perl spec template.
 
 * Thu Nov 25 2004 Miloslav Trmac <mitr@redhat.com> - 5.3-10
 - Convert man page to UTF-8
diff --git a/sources b/sources
index 4684650..65e931d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0548d1238b026920986c27956524a5d5  Date-Calc-5.3.tar.gz
+7ae34972694127e8f1c9a2af1c24585b  Date-Calc-5.4.tar.gz