diff --git a/perl-Convert-ASN1.spec b/perl-Convert-ASN1.spec
index 1bdfb23..2cf5f8a 100644
--- a/perl-Convert-ASN1.spec
+++ b/perl-Convert-ASN1.spec
@@ -1,30 +1,47 @@
-Summary:        ASN.1 Encode/Decode library
+# Perform optional tests
+%bcond_without perl_Convert_ASN1_enables_optional_test
+
+Summary:        ASN.1 encode/decode library
 Name:           perl-Convert-ASN1
 Version:        0.27
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/Convert-ASN1
 Source0:        https://cpan.metacpan.org/authors/id/G/GB/GBARR/Convert-ASN1-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
 # Run-time:
-BuildRequires:  perl(constant)
+BuildRequires:  perl(:VERSION) >= 5.4
 BuildRequires:  perl(Carp)
+BuildRequires:  perl(constant)
 BuildRequires:  perl(Encode)
 BuildRequires:  perl(Exporter)
+BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Socket)
 BuildRequires:  perl(Time::Local)
-# Tests only
-BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(utf8)
+BuildRequires:  perl(vars)
+# Optional run-time:
+BuildRequires:  perl(bytes)
+# Tests:
 BuildRequires:  perl(IO::Socket)
 BuildRequires:  perl(Math::BigInt) >= 1.997
-BuildRequires:  perl(Test::More) >= 0.90
+%if %{with perl_Convert_ASN1_enables_optional_test}
+# Optional tests:
+BuildRequires:  perl(Data::Dumper)
+%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-# Indented requires, not autodetected at the moment
+Suggests:       perl(bytes)
 Requires:       perl(Carp)
 Requires:       perl(Encode)
+Requires:       perl(POSIX)
 Requires:       perl(Time::Local)
+Requires:       perl(utf8)
 
 %description
 Convert::ASN1 encodes and decodes ASN.1 data structures using BER/DER rules.
@@ -33,24 +50,27 @@ Convert::ASN1 encodes and decodes ASN.1 data structures using BER/DER rules.
 %setup -q -n Convert-ASN1-%{version}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-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}/*
+%{make_install}
+%{_fixperms} %{buildroot}/*
 
 %check
+unset YYDEBUG
 make test
 
 %files
-%doc ChangeLog LICENSE OldChanges README.md examples/
+%license LICENSE
+%doc ChangeLog OldChanges README.md examples/
 %{perl_vendorlib}/Convert/
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Wed Aug 28 2019 Petr Pisar <ppisar@redhat.com> - 0.27-16
+- Modernize spec file
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild