diff --git a/zvbi-0.2.25-openfix.patch b/zvbi-0.2.25-openfix.patch
new file mode 100644
index 0000000..5d8ab6f
--- /dev/null
+++ b/zvbi-0.2.25-openfix.patch
@@ -0,0 +1,11 @@
+--- zvbi-0.2.25/src/chains.c.orig	2007-03-09 05:11:52.000000000 +0000
++++ zvbi-0.2.25/src/chains.c	2007-08-23 21:29:44.000000000 +0100
+@@ -168,7 +168,7 @@
+       return 0;
+ }
+ 
+-int open(const char *pathname, int flags, ...)
++int (open)(const char *pathname, int flags, ...)
+ {
+    va_list args;
+    mode_t mode = 0;
diff --git a/zvbi.spec b/zvbi.spec
index ae8603e..a9430fc 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -1,12 +1,16 @@
+%define             fontdir %{_datadir}/fonts/%{name}
+%define             catalogue %{_sysconfdir}/X11/fontpath.d
+
 Name:               zvbi
 Version:            0.2.25
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
 Group:              System Environment/Libraries
-License:            GPL
+License:            GPLv2+
 URL:                http://zapping.sourceforge.net/ZVBI/index.html
 Source0:            http://dl.sf.net/zapping/%{name}-%{version}.tar.bz2
 Patch0:             zvbi-0.2.24-tvfonts.patch
+Patch1:             zvbi-0.2.25-openfix.patch
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
@@ -44,8 +48,11 @@ Summary:            Fonts from zvbi converted to X11
 Group:              User Interface/X
 Requires(post):     fontconfig
 Requires(postun):   fontconfig
+# Don't use chkfontpath for F8+, it's legacy.
+%if 0%{?fedora} <= 7
 Requires(post):     chkfontpath
 Requires(postun):   chkfontpath
+%endif
 Obsoletes:          xawtv-tv-fonts < 3.95
 Provides:           xawtv-tv-fonts >= 3.95
 
@@ -56,6 +63,7 @@ Fonts from zvbi converted for use with X11
 %prep
 %setup -q
 %patch -p1 -b .orig
+%patch1 -p1
 
 #Fix character encodings (note ChangeLog's encoding is broken, hence sed)
 sed -i 's/\xC3\xB2/\xF2/g' ChangeLog
@@ -67,7 +75,7 @@ iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
 %build
 # Note: We don't do --enable-static=no because static libs are needed to build
 # x11font during compile time to convert zvbi fonts into x11 fonts. x11font
-# is thrown away and not installed because it's not useful for anything else
+# is thrown away and not installed as it's not useful for anything else
 %configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy
 make %{?_smp_mflags}
 
@@ -87,7 +95,7 @@ popd
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_datadir}/fonts/%{name}
+mkdir -p %{buildroot}%{fontdir}
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 make install DESTDIR=%{buildroot}
 
@@ -98,11 +106,16 @@ make install DESTDIR=%{buildroot}
 install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid
 
 #Install fonts
-install -m 0644 contrib/*.pcf.gz %{buildroot}%{_datadir}/fonts/%{name}
-install -m 0644 contrib/fonts.* %{buildroot}%{_datadir}/fonts/%{name}
+install -m 0644 contrib/*.pcf.gz %{buildroot}%{fontdir}
+install -m 0644 contrib/fonts.* %{buildroot}%{fontdir}
 
 #%%ghost the fonts.cache-1 and fonts.dir
-touch %{buildroot}%{_datadir}/fonts/%{name}/fonts.cache-1
+touch %{buildroot}%{fontdir}/fonts.cache-1
+
+%if 0%{?fedora} > 7
+mkdir -p %{buildroot}%{catalogue}
+ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
+%endif
 
 
 %clean
@@ -130,13 +143,17 @@ fi
 
 %post fonts
 fc-cache -f %{_datadir}/fonts/%{name} || :
-chkfontpath -q -a %{_datadir}/fonts/%{name} || :
+%if 0%{?fedora} <= 7
+chkfontpath -q -a %{fontdir} || :
+%endif
 
 
 %postun fonts
 if [ "$1" = "0" ]; then
     fc-cache -f %{_datadir}/fonts || :
-    chkfontpath -q -r %{_datadir}/fonts/%{name} || :
+%if 0%{?fedora} <= 7
+    chkfontpath -q -r %{fontdir} || :
+%endif
 fi
 
 
@@ -160,17 +177,26 @@ fi
 
 %files fonts
 %dir %{_datadir}/fonts/%{name}
-%{_datadir}/fonts/%{name}/*.gz
-%{_datadir}/fonts/%{name}/fonts.dir
-%{_datadir}/fonts/%{name}/fonts.alias
-%ghost %{_datadir}/fonts/%{name}/fonts.cache-1
+%{fontdir}/*.gz
+%{fontdir}/fonts.dir
+%{fontdir}/fonts.alias
+%if 0%{?fedora} > 7
+%{catalogue}/%{name}
+%endif
+%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
-* Sun May 27 2007 Ian Chapman <packages@amiga-hardware.com> 0.2.25-1%{?dist}
+* Wed Aug 22 2007 Ian Chapman <packages@amiga-hardware.com> 0.2.25-2
+- Release bump for F8 mass rebuild
+- License change due to new guidelines
+- Use fontpath.d for F8+
+- Added patch to fix compilation with open() macro on F8+
+
+* Sun May 27 2007 Ian Chapman <packages@amiga-hardware.com> 0.2.25-1
 - Upgrade to 0.2.25
 
-* Tue Mar 13 2007 Ian Chapman <packages@amiga-hardware.com> 0.2.24-1%{?dist}
+* Tue Mar 13 2007 Ian Chapman <packages@amiga-hardware.com> 0.2.24-1
 - Upgrade to 0.2.24
 - Convert README and ChangeLog to UTF-8
 - Added patch for x11font to generate more font sizes useful for other
@@ -180,8 +206,8 @@ fi
 - Various other minor changes to the spec
 - Added xfs support for the fonts
 
-* Fri Sep 01 2006 Ian Chapman <packages@amiga-hardware.com> 0.2.22-2%{?dist}
+* Fri Sep 01 2006 Ian Chapman <packages@amiga-hardware.com> 0.2.22-2
 - Minor spec cleanups
 
-* Tue Aug 29 2006 Ian Chapman <packages@amiga-hardware.com> 0.2.22-1%{?dist}
-- Initial release
\ No newline at end of file
+* Tue Aug 29 2006 Ian Chapman <packages@amiga-hardware.com> 0.2.22-1
+- Initial release