diff --git a/.gitignore b/.gitignore
index 7207358..eb981d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 HTML-Format-2.04.tar.gz
+/HTML-Format-2.05.tar.gz
diff --git a/perl-HTML-Format.spec b/perl-HTML-Format.spec
index d7ea950..e3970d9 100644
--- a/perl-HTML-Format.spec
+++ b/perl-HTML-Format.spec
@@ -1,20 +1,47 @@
 Name:           perl-HTML-Format
-Version:        2.04
-Release: 	15%{?dist}
+Version:        2.05
+Release: 	1%{?dist}
 Summary:        HTML formatter modules
 
 Group: 		Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Format/
-Source0:       	http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Format-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:       	http://www.cpan.org/authors/id/N/NI/NIGELM/HTML-Format-%{version}.tar.gz
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(HTML::Element) >= 3.15
+BuildRequires:	perl(HTML::TreeBuilder)
 BuildRequires:	perl(Font::AFM) >= 1.17
+BuildRequires:  perl(File::Slurp)
+BuildRequires:  perl(Test::More) >= 0.96
+BuildRequires:  perl(Font::Metrics::Courier)
+BuildRequires:  perl(Font::Metrics::CourierBold)
+BuildRequires:  perl(Font::Metrics::CourierBoldOblique)
+BuildRequires:  perl(Font::Metrics::CourierOblique)
+BuildRequires:  perl(Font::Metrics::Helvetica)
+BuildRequires:  perl(Font::Metrics::HelveticaBold)
+BuildRequires:  perl(Font::Metrics::HelveticaBoldOblique)
+BuildRequires:  perl(Font::Metrics::HelveticaOblique)
+BuildRequires:  perl(Font::Metrics::TimesBold)
+BuildRequires:  perl(Font::Metrics::TimesBoldItalic)
+BuildRequires:  perl(Font::Metrics::TimesItalic)
+BuildRequires:  perl(Font::Metrics::TimesRoman)
+
+# for release-testing tests
+# Not yet in Fedora: BuildRequires:  perl(Pod::Wordlist::hanekomu)
+BuildRequires:  perl(Test::CPAN::Meta)
+# Not yet in Fedora: BuildRequires:  perl(Test::DistManifest)
+BuildRequires:  perl(Test::EOL)
+# Not yet in Fedora: BuildRequires:  perl(Test::HasVersion)
+BuildRequires:  perl(Test::MinimumVersion)
+BuildRequires:  perl(Test::NoTabs)
+BuildRequires:  perl(Test::Pod) >= 1.41
+BuildRequires:  perl(Test::Portability::Files)
+BuildRequires:  perl(Test::Synopsis)
+# Not yet in Fedora: BuildRequires:  BuildRequires:  perl(Test::Vars)
 
 # These must match
 # %FontFamilies in lib/HTML/FormatPS.pm
@@ -42,20 +69,14 @@ A collection of modules that formats HTML as plaintext, PostScript or RTF.
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 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 -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-make test
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+make test RELEASE_TESTING=1
 
 %files
 %defattr(-,root,root,-)
@@ -64,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/HTML*
 
 %changelog
+* Thu Mar 03 2011 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.05-1
+- Upstream update.
+- Reflect Source0:-URL having changed.
+- Rework spec-file.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.04-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 0aca2f4..446b4ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d287392b77c959f06397371116c2d7e  HTML-Format-2.04.tar.gz
+fa410f4789f442eaf1e7a63b33fe9d91  HTML-Format-2.05.tar.gz