diff --git a/perl-Geo-IPfree.spec b/perl-Geo-IPfree.spec
index 7b0378b..22270a8 100644
--- a/perl-Geo-IPfree.spec
+++ b/perl-Geo-IPfree.spec
@@ -2,18 +2,19 @@
 %global cpan_version 1.151940
 %global cpan_author BRICAS
 Name:           perl-%{cpan_name}
-Version:        %(echo '%cpan_version' | sed 's/^\([0-9]\{1,\}\)\./\1\n/' | sed '2 s/\(.\)/.\1/g' | sed '1N;s/\n//')
-Release:        3%{?dist}
+# Normalize version to dotted format
+Version:        %(echo '%{cpan_version}' | sed 's/\(\....\)\(.\)/\1.\2/')
+Release:        1%{?dist}
 Summary:        Look up the country of an IPv4 Address
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/%{cpan_name}/
 Source0:        http://www.cpan.org/authors/id/%(echo '%{cpan_author}' | sed 's=\(.\)\(.\)=\1/\1\2/\1\2=')/%{cpan_name}-%{cpan_version}.tar.gz
 BuildArch:      noarch
-BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
 BuildRequires:  perl
+BuildRequires:  perl-generators
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
@@ -44,7 +45,7 @@ make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -type f -name .packlist -delete
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
@@ -56,6 +57,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jun 03 2016 Petr Pisar <ppisar@redhat.com> - 1.151.940-1
+- Normalize version format
+
 * Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.1.5.1.9.4.0-3
 - Perl 5.24 rebuild