diff --git a/perl-HTTP-Message.spec b/perl-HTTP-Message.spec
index 747d01d..b21bb7c 100644
--- a/perl-HTTP-Message.spec
+++ b/perl-HTTP-Message.spec
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Message
 Version:        6.03
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTTP style message
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,7 +12,10 @@ BuildRequires:  perl(Encode) >= 2.12
 BuildRequires:  perl(Encode::Locale) >= 1
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker)
+# Break build-time cycle (bug #810223) HTML::Parser <-> HTTP::Headers 
+%if 0%{!?perl_bootstrap:1}
 BuildRequires:  perl(HTML::Parser) >= 3.33
+%endif
 BuildRequires:  perl(HTTP::Date) >= 6
 BuildRequires:  perl(IO::Compress::Bzip2) >= 2.021
 BuildRequires:  perl(IO::Compress::Deflate)
@@ -77,7 +80,12 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
+%if 0%{!?perl_bootstrap:1}
 make test
+%else
+# t/message-charset.t exercises HTTP::Message, which requires HTML::Parser
+make test TEST_FILES="$(echo $(find t/ -name '*.t' | grep -Fvx t/message-charset.t))"
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -86,6 +94,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 06 2012 Petr Pisar <ppisar@redhat.com> - 6.03-2
+- Break build-time cycle while boostrapping perl (bug #810223)
+
 * Mon Feb 20 2012 Petr Pisar <ppisar@redhat.com> - 6.03-1
 - 6.03 bump