diff --git a/.cvsignore b/.cvsignore
index f83d1ef..83a5fb3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-Bit-Vector-6.3.tar.gz
 Bit-Vector-6.4.tar.gz
diff --git a/perl-Bit-Vector.spec b/perl-Bit-Vector.spec
index 06d0885..46ecf63 100644
--- a/perl-Bit-Vector.spec
+++ b/perl-Bit-Vector.spec
@@ -1,14 +1,18 @@
-Name: perl-Bit-Vector
-Version: 6.3
-Release: 5
-Summary: A module for high-performance Perl manipulation of bit vectors.
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/search?mode=module&query=Bit%3a%3aVector
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl >= 0:5.00503
-Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Bit-Vector-%{version}.tar.gz
+Name:           perl-Bit-Vector
+Version:        6.4
+Release:        1
+Summary:        A module for high-performance Perl manipulation of bit vectors
+
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/Bit-Vector/
+Source0: http://www.cpan.org/authors/id/S/ST/STBEY/Bit-Vector-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl-Carp-Clan >= 5.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl-Carp-Clan >= 5.3
 
 %description
 Bit::Vector is an efficient C library which allows you to handle bit
@@ -19,42 +23,47 @@ The library is efficient (in terms of algorithmical complexity) and
 therefore fast (in terms of execution speed) for instance through the
 widespread use of divide-and-conquer algorithms.
 
+
 %prep
 %setup -q -n Bit-Vector-%{version} 
+chmod 644 examples/*.pl
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' examples/benchmk1.pl
+%{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' \
+    examples/{benchmk{2,3},primes,SetObject}.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"
 
+%install
+rm -rf $RPM_BUILD_ROOT
+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/*
+
+%check || :
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-%install
 
-rm -rf $RPM_BUILD_ROOT
-make install
 
-[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+%files
+%defattr(-,root,root,-)
+%doc Artistic.txt GNU_GPL.txt GNU_LGPL.txt
+%doc CHANGES.txt CREDITS.txt README.txt examples/
+%{perl_vendorarch}/Bit/
+%{perl_vendorarch}/auto/Bit/
+%{_mandir}/man3/*.3*
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" | \
-	grep -v perllocal.pod | \
-        grep -v Carp::Clan.3pm.gz | \
-        grep -v Carp/Clan | \
-	grep -v "\.packlist" > Bit-Vector-%{version}-filelist
-if [ "$(cat Bit-Vector-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
-
-find $RPM_BUILD_ROOT/usr -name perllocal.pod -o -name 'Carp::Clan.3pm*' \
-	-o -path '*Carp/Clan*' -o -name .packlist | xargs rm -f
-
-%files -f Bit-Vector-%{version}-filelist
-%defattr(-,root,root)
 
 %changelog
+* Sat Apr  2 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 6.4-1
+- Update to 6.4.
+- Bring up to date with current Fedora.Extras perl spec template.
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 1082e36..9e592e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8b2bd3bf6fe5b0de4cbeaf0621b969f5  Bit-Vector-6.3.tar.gz
 681433ff4f0b4da95dc5c560b7f5cc31  Bit-Vector-6.4.tar.gz