diff --git a/.gitignore b/.gitignore
index 73fb084..ff2a909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Digest-CRC-0.14.tar.gz
+/Digest-CRC-0.16.tar.gz
diff --git a/perl-Digest-CRC.spec b/perl-Digest-CRC.spec
index 545d188..7fa7328 100644
--- a/perl-Digest-CRC.spec
+++ b/perl-Digest-CRC.spec
@@ -1,50 +1,42 @@
 Name:           perl-Digest-CRC
-Version:        0.14
-Release:        8%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Generic CRC functions
-
 Group:          Development/Libraries
 License:        Public Domain
 URL:            http://search.cpan.org/dist/Digest-CRC
 Source0:        http://search.cpan.org/CPAN/authors/id/O/OL/OLIMAUL/Digest-CRC-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  perl(ExtUtils::MakeMaker)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Fcntl)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(DynaLoader)
+BuildRequires:  perl(vars)
+Requires:       perl(Exporter)
+Requires:       perl(DynaLoader)
+Requires:       perl(vars)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 The Digest::CRC module calculates CRC sums of all sorts. It contains wrapper
 functions with the correct parameters for CRC-CCITT, CRC-16 and CRC-32.
 
-
 %prep
 %setup -qn Digest-CRC-%{version}
 
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
-
 %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 -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
-# remove zero-length files
-find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
-
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w %{buildroot}/*
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
 
 %check
 make test
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
 %doc Changes META.yml README t
@@ -52,8 +44,12 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/Digest
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Tue Apr 26 2011 Petr Sabata <psabata@redhat.com> - 0.16-1
+- 0.16 bump
+- Buildroot removed, general cleanup
+- Fixing [B]Requires...
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index dacf078..41998e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5a6c4c37383f1ec5e51c5fec0af023c  Digest-CRC-0.14.tar.gz
+6ddd9861434f2b09bbce2363d0edc90c  Digest-CRC-0.16.tar.gz