diff --git a/perl-HTML-Format.spec b/perl-HTML-Format.spec
index 92c9ce6..bb49248 100644
--- a/perl-HTML-Format.spec
+++ b/perl-HTML-Format.spec
@@ -1,21 +1,20 @@
 # As of release 2.13, upstream renamed the package into HTML-Formatter
-%global tarvers 2.14
 
-%if "%{tarvers}" > "2.12"
+Name:           perl-HTML-Format
+Version:        2.14
+Release:        2%{?dist}
+Summary:        HTML formatter modules
+
+%if "%{version}" > "2.12"
 # This package should be renamed into perl-HTML-Formatter
 %global tarname HTML-Formatter
 %else
 %global tarname HTML-Format
 %endif
 
-Name:           perl-HTML-Format
-Version:        %{tarvers}
-Release:        1%{?dist}
-Summary:        HTML formatter modules
-
 Group:          Development/Libraries
 License:        GPL+ or Artistic
-URL:            http://search.cpan.org/dist/HTML-Format/
+URL:            http://search.cpan.org/dist/%{tarname}/
 Source0:        http://www.cpan.org/authors/id/N/NI/NIGELM/%{tarname}-%{version}.tar.gz
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -51,7 +50,7 @@ BuildRequires:  perl(Font::Metrics::TimesItalic)
 BuildRequires:  perl(Font::Metrics::TimesRoman)
 
 # These must match
-# %FontFamilies in lib/HTML/FormatPS.pm
+# FontFamilies in lib/HTML/FormatPS.pm
 Requires:       perl(Font::Metrics::Courier)
 Requires:       perl(Font::Metrics::CourierBold)
 Requires:       perl(Font::Metrics::CourierBoldOblique)
@@ -69,7 +68,7 @@ Requires:       perl(Font::Metrics::TimesRoman)
 %description
 A collection of modules that formats HTML as plaintext, PostScript or RTF.
 
-%if "%{tarvers}" > "2.12"
+%if "%{version}" > "2.12"
 %package -n perl-%{tarname}
 Summary:        %{summary}
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -102,6 +101,10 @@ A collection of modules that formats HTML as plaintext, PostScript or RTF.
 %{_mandir}/man3/HTML*
 
 %changelog
+* Wed Dec 09 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.14-2
+- Eliminate %%tarvers from spec.
+- Spec file cosmetics.
+
 * Wed Dec 09 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.14-1
 - Update to HTML-Formatter-2.14.
 
@@ -161,7 +164,7 @@ A collection of modules that formats HTML as plaintext, PostScript or RTF.
 
 * Mon Aug 22 2011 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.10-1
 - Upstream update.
-- Build in HTML-Format-%{version} subdir.
+- Build in HTML-Format-%%{version} subdir.
 - Add HTML-Format-2.10.diff.
 
 * Tue Jul 19 2011 Petr Sabata <contyk@redhat.com> - 2.09-2
@@ -216,12 +219,12 @@ A collection of modules that formats HTML as plaintext, PostScript or RTF.
 * Wed Mar 01 2006 Ralf Corsépius <rc040203@freenet.de> - 2.04-4
 - Rebuild for perl-5.8.8.
 
-* Wed Aug 31 2005 Ralf Corsepius <rc040203@freenet.de>	- 2.04-3
+* Wed Aug 31 2005 Ralf Corsepius <rc040203@freenet.de> - 2.04-3
 - Improve summary.
 
-* Fri Aug 26 2005 Ralf Corsepius <ralf@links2linux.de>	- 2.04-2
+* Fri Aug 26 2005 Ralf Corsepius <ralf@links2linux.de> - 2.04-2
 - Add Requires: perl(Font::Metrics:*).
 - Minor Spec cleanup.
 
-* Thu Aug 18 2005 Ralf Corsepius <ralf@links2linux.de>	- 2.04-1
+* Thu Aug 18 2005 Ralf Corsepius <ralf@links2linux.de> - 2.04-1
 - FE submission.