diff --git a/zvbi.spec b/zvbi.spec
index 2be9a61..51e6959 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -3,7 +3,7 @@
 
 Name:               zvbi
 Version:            0.2.33
-Release:            4%{?dist}
+Release:            5%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
 Group:              System Environment/Libraries
 # See NEWS for a full breakdown of licensing.
@@ -12,6 +12,7 @@ URL:                http://zapping.sourceforge.net/ZVBI/index.html
 Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
 Patch0:             %{name}-0.2.24-tvfonts.patch
 Patch1:             %{name}-0.2.25-openfix.patch
+Patch2:		    %{name}-0.2.33-stat.patch
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
@@ -54,6 +55,9 @@ Requires(postun):   fontconfig
 Requires(post):     chkfontpath
 Requires(postun):   chkfontpath
 %endif
+%if 0%{?fedora? > 9
+BuildArch:	    noarch
+%endif
 Obsoletes:          xawtv-tv-fonts < 3.95
 Provides:           xawtv-tv-fonts >= 3.95
 
@@ -63,8 +67,9 @@ Fonts from zvbi converted for use with X11
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
+%patch0 -p1
 %patch1 -p1
+%patch1 -p2
 
 #Fix character encodings
 iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
@@ -185,6 +190,10 @@ fi
 
 
 %changelog
+* Sun Feb 21 2010 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.33-5
+- add patch to fix compiling under rawhide (#564991)
+- make fonts subpackage arch independent
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.33-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild