diff --git a/.cvsignore b/.cvsignore
index 6791928..b2b7590 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 kdetv-0.8.9.tar.bz2
+kdetv-0.8.9-indexcaches.tar.bz2
diff --git a/kdetv.spec b/kdetv.spec
index 83520a2..6ab2901 100644
--- a/kdetv.spec
+++ b/kdetv.spec
@@ -1,16 +1,17 @@
 Name:           kdetv
 Version:        0.8.9
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        KDE application for watching TV
 Group:          Applications/Multimedia
 # Licensing Notes:
-# Kdetv itself is GPLv2
-# The kdetv libraries appear to be LGPLv2
+# Kdetv itself is GPLv2+
+# Most of the libraries are LGPLv2+
 # The kdetv handbook is GFDL
-License:        GPLv2 and LGPLv2 and GFDL
-# Upstream no longer appears to be active
-URL:            http://www.kdetv.org
+License:        GPLv2+ and LGPLv2+ and GFDL
+# Original URL was http://www.kdetv.org, but this appears no longer active.
+URL:            http://dziegel.free.fr/releases/
 Source0:        http://dziegel.free.fr/releases/%{name}/%{name}-%{version}.tar.bz2
+Source1:        %{name}-%{version}-indexcaches.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
@@ -47,7 +48,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 %find_lang %{name}
 
 #Install .desktop file to better location
@@ -55,6 +56,9 @@ desktop-file-install --delete-original --vendor fedora \
                      --dir %{buildroot}%{_datadir}/applications \
                      %{buildroot}%{_datadir}/applnk/Multimedia/%{name}.desktop
 
+# Horrible multiarch hack, use pre-generated index caches.
+tar -xjf %{SOURCE1} -C %{buildroot}
+
 # Convert absolute symlinks to relative
 rm -f %{buildroot}%{_datadir}/doc/HTML/*/%{name}/common
 for i in %{buildroot}%{_datadir}/doc/HTML/*/%{name}/; do
@@ -102,19 +106,26 @@ fi
 
 
 %changelog
-* Sun Aug 12 2007 Ian Chapman <packages@amiga-hardware.com> 0.8.9-5
+* Sat Oct 27 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-7
+- Multiarch fixes (BZ 341781)
+
+* Wed Aug 22 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-6
+- Release bump for F8 mass rebuild
+- Further license clarifications
+
+* Sun Aug 12 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-5
 - Updated license field due to new guidelines
 - Fixed .desktop categories
 
-* Sat Sep 09 2006 Ian Chapman <packages@amiga-hardware.com> 0.8.9-4
+* Sat Sep 09 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-4
 - Dropped libXext buildrequire as it's pulled in by qt-devel
 
-* Fri Sep 01 2006 Ian Chapman <packages@amiga-hardware.com> 0.8.9-3
+* Fri Sep 01 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-3
 - Minor spec file cleanup
 - Drop vendor tag from .desktop as it's not created by fedora
 
-* Wed Aug 30 2006 Ian Chapman <packages@amiga-hardware.com> 0.8.9-2
+* Wed Aug 30 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-2
 - Added zvbi support
 
-* Sun Aug 27 2006 Ian Chapman <packages@amiga-hardware.com> 0.8.9-1
+* Sun Aug 27 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.8.9-1
 - Initial release
\ No newline at end of file
diff --git a/sources b/sources
index 4b9e74d..7beb87e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 7a5d73e08bc133cc2db228cb6655670e  kdetv-0.8.9.tar.bz2
+34048525862458aa44da6c736c71882f  kdetv-0.8.9-indexcaches.tar.bz2