diff --git a/.gitignore b/.gitignore
index e3257bc..8641a9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/HTML-Formatter-2.14.tar.gz
+/HTML-Formatter-2.16.tar.gz
diff --git a/perl-HTML-Format.spec b/perl-HTML-Format.spec
index afeaafb..8314d72 100644
--- a/perl-HTML-Format.spec
+++ b/perl-HTML-Format.spec
@@ -1,8 +1,8 @@
 # As of release 2.13, upstream renamed the package into HTML-Formatter
 
 Name:           perl-HTML-Format
-Version:        2.14
-Release:        4%{?dist}
+Version:        2.16
+Release:        1%{?dist}
 Summary:        HTML formatter modules
 
 %if "%{version}" > "2.12"
@@ -12,7 +12,6 @@ Summary:        HTML formatter modules
 %global tarname HTML-Format
 %endif
 
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/%{tarname}/
 Source0:        http://www.cpan.org/authors/id/N/NI/NIGELM/%{tarname}-%{version}.tar.gz
@@ -31,11 +30,11 @@ BuildRequires:  perl(Font::AFM) >= 1.17
 BuildRequires:  perl(HTML::Element) >= 3.15
 BuildRequires:  perl(HTML::TreeBuilder)
 BuildRequires:  perl(IO::File)
-BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::CPAN::Meta)
 BuildRequires:  perl(Test::EOL)
 BuildRequires:  perl(Test::More) >= 0.96
 BuildRequires:  perl(Test::NoTabs)
+BuildRequires:  perl(Test::Warnings)
 
 BuildRequires:  perl(Font::Metrics::Courier)
 BuildRequires:  perl(Font::Metrics::CourierBold)
@@ -85,15 +84,15 @@ A collection of modules that formats HTML as plaintext, PostScript or RTF.
 %setup -q -n %{tarname}-%{version}
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build
+%{__perl} Makefile.PL installdirs=vendor NO_PACKLIST=1
+%{__make} %{?_smp_mflags}
 
 %install
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+%{__make} pure_install DESTDIR=$RPM_BUILD_ROOT
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+%{__make} test
 
 %files -n perl-%{tarname}
 %doc Changes README
@@ -102,6 +101,11 @@ A collection of modules that formats HTML as plaintext, PostScript or RTF.
 %{_mandir}/man3/HTML*
 
 %changelog
+* Fri Dec 09 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.16-1
+- Update to HTML-Formatter-2.16.
+- Reflect upstream having switched to ExtUtils::MakeMaker.
+- Spec cleanup.
+
 * Tue May 17 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2.14-4
 - Perl 5.24 rebuild
 
diff --git a/sources b/sources
index 9cb1326..96efb13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af35f37c2114a355923d924aa8536253  HTML-Formatter-2.14.tar.gz
+16adca9bc55dbff85daa6c0ae74ff730  HTML-Formatter-2.16.tar.gz