diff --git a/.cvsignore b/.cvsignore
index bd2aa5c..d69bc05 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-blam-1.8.3.tar.bz2
+blam-1.8.5.tar.bz2
diff --git a/blam.spec b/blam.spec
index 7bfa02c..e9825f8 100644
--- a/blam.spec
+++ b/blam.spec
@@ -1,11 +1,11 @@
 ## XXX: Hopefully Mono, Blam and multilib will play nicely soon...
 %define	_libdir			%{_prefix}/lib
 %define	dbus_sharp_min_version	0.60
-%define	gecko_version		1.9
+%define	gecko_version		1.9.0.1
 
 Name:		blam
-Version:	1.8.3
-Release:	14%{?dist}
+Version:	1.8.5
+Release:	1%{?dist}
 Summary:	An RSS/RDF feed reader
 
 Group:		Applications/Internet
@@ -14,11 +14,12 @@ URL:		http://www.cmartin.tk/blam.html
 
 Source0:	http://www.cmartin.tk/blam/%{name}-%{version}.tar.bz2
 
-Patch0:		%{name}-fix-PrintJob-ambiguous-reference.patch
-Patch1:		%{name}-fedora-people-in-default-collection.patch
-Patch2:		%{name}-fix-THEME_DIR-path.patch
-Patch3:		%{name}-CVE-2005-4790.patch
+#Patch0:		%{name}-fix-PrintJob-ambiguous-reference.patch
+#Patch1:		%{name}-fedora-people-in-default-collection.patch
+#Patch2:		%{name}-fix-THEME_DIR-path.patch
+#Patch3:		%{name}-CVE-2005-4790.patch
 Patch4:		%{name}-xulrunner.patch
+Patch5:         %{name}-xulrunner-configure.patch
  
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## Various Mono dependencies are not available for ppc64; see bug 241850.
@@ -29,7 +30,7 @@ ExcludeArch:	ppc64
 ## being installed against the version we are expecting to.
 BuildRequires:	dbus-sharp-devel >= %{dbus_sharp_min_version}
 BuildRequires:	desktop-file-utils
-BuildRequires:	gecko-devel = %{gecko_version}
+BuildRequires:	gecko-devel-unstable = %{gecko_version}
 BuildRequires:	gecko-sharp2-devel >= 0.12-6
 BuildRequires:	gettext
 BuildRequires:	gnome-sharp-devel
@@ -38,6 +39,7 @@ BuildRequires:	gtk-sharp2-gapi
 BuildRequires:	libgnomeui-devel
 BuildRequires:	mono-devel
 BuildRequires:	perl(XML::Parser)
+BuildRequires:  intltool
 
 Requires:	dbus-sharp >= %{dbus_sharp_min_version}	
 Requires:	gecko-sharp2
@@ -63,15 +65,16 @@ use and clean interface to stay up to date
 
 %prep
 %setup -q
-%patch0 -p0 -b .fix-PrintJob-ambiguous-reference-compile-error
-%patch1 -p0 -b .add-fedora-people-feed-to-default-collection.xml
-%patch2 -p0 -b .fix-THEME_DIR-path
-%patch3 -p1 -b .CVE-2005-4790
+#patch0 -p0 -b .fix-PrintJob-ambiguous-reference-compile-error
+#patch1 -p0 -b .add-fedora-people-feed-to-default-collection.xml
+#patch2 -p0 -b .fix-THEME_DIR-path
+#patch3 -p1 -b .CVE-2005-4790
 %patch4 -p1 -b .xl
+%patch5 -p1 -b .xlc
 
 %build
 export CFLAGS="%{optflags} -debug"
-%configure --disable-static 
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -127,9 +130,18 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/blam
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svg
 %{_mandir}/man?/%{name}.1*
 
 %changelog
+* Mon Mar 31 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.8.5-1
+- Update to upstream (1.8.5)
+- Set gecko version to new xulrunner: 1.9.0.1
+- BR: gecko-devel-unstable
+- Drop a number of patches which no longer apply
+- Add new icons to file list.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.8.3-14
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index 5ee7977..0341647 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-884299d959dfc59589693aea9427807b  blam-1.8.3.tar.bz2
+bb5f18ae5f7ec9ac682b93273cf6990c  blam-1.8.5.tar.bz2