diff --git a/.cvsignore b/.cvsignore
index 789f5e6..d100a6a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-devhelp-0.8.1.tar.bz2
+devhelp-0.9.tar.bz2
diff --git a/devhelp.spec b/devhelp.spec
index c9f0658..1c378bc 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -1,22 +1,29 @@
+%define mozver %(rpm -q mozilla --qf "%%{name} = %%{epoch}:%%{version}")
+ExclusiveArch: i386 x86_64 ppc s390
+
 Summary:             API document browser
 Name:                devhelp
-Version:             0.8.1
-Release: 1.1
+Version:             0.9
+Release:             3
 License:             GPL
 Group:               Development/Tools
 Url:                 http://www.imendio.com/projects/devhelp/
 Source:              %{name}-%{version}.tar.bz2
+Patch1:              devhelp-0.9-ld-library-path.patch
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root
 
 Requires:            gtk2 >= 2.2.0
 Requires:            libgnomeui >= 2.2.0
-Requires:            gtkhtml2 >= 2.0.0
 Requires:            gnome-vfs2 >= 2.2.0
+Requires:            libglade2 >= 2.2.0
+Requires:            %mozver
 
 BuildRequires:       gtk2-devel >= 2.2.0
 BuildRequires:       libgnomeui-devel >= 2.2.0
-BuildRequires:       gtkhtml2-devel >= 2.2.0
 BuildRequires:       gnome-vfs2-devel >= 2.2.0
+BuildRequires:       libglade2-devel >= 2.2.0
+BuildRequires:       mozilla-devel >= 1.6
+BuildRequires:       mozilla
 BuildRequires:       intltool
 BuildRequires:       gettext
 BuildRequires:       desktop-file-utils
@@ -37,6 +44,7 @@ Library of Devhelp for embedding into other applications.
 
 %prep
 %setup -q
+%patch1 -p1 -b .ld-library-path
 
 %build
 
@@ -48,7 +56,9 @@ make
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} install 
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome			\
   --delete-original					\
@@ -64,11 +74,19 @@ find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="devhelp.schemas"
+for S in $SCHEMAS; do
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+done
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README INSTALL
 
 %{_bindir}/devhelp
+%{_bindir}/devhelp-bin
 %{_libdir}/libdevhelp*.so.*
 
 %{_datadir}/applications/*.desktop
@@ -76,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 %{_datadir}/mime-info/devhelp.mime
 %{_datadir}/mime-info/devhelp.keys
+%{_sysconfdir}/gconf/schemas/*.schemas
 
 %files devel
 %defattr(-,root,root)
@@ -84,6 +103,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 21 2004 Colin Walters <walters@redhat.com> 0.9-3
+- Update patch to avoid (unlikely) security issue noticed
+  by Jeremy Katz.
+
+* Mon Apr 15 2004 Colin Walters <walters@redhat.com> 0.9-2
+- Apply patch from George Karabin <gkarabin@pobox.com> to
+  export LD_LIBRARY_PATH (closes bug 120220).
+
+* Fri Apr  2 2004 Mark McLoughlin <markmc@redhat.com> 0.9-1
+- Update to 0.9
+- Install the schemas correctly
+- Package /usr/bin/devhelp-bin
+- Update requires/buildrequires
+- Only build on platforms where mozilla is available
+
 * Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
@@ -105,4 +139,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat May 24 2003 Florian La Roche <Florian.LaRoche@redhat.de>
 - add find_lang
-
diff --git a/sources b/sources
index a0287c7..9b5f6e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16885ffa39dc7a71d98bc838998b9b90  devhelp-0.8.1.tar.bz2
+cc1394c8738b91e7b95943a60977759f  devhelp-0.9.tar.bz2