diff --git a/.cvsignore b/.cvsignore
index 19163a1..5bbd748 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-parole-0.1.91.tar.bz2
+parole-0.1.96.tar.bz2
diff --git a/parole.spec b/parole.spec
index 60bb0bb..f873ac5 100644
--- a/parole.spec
+++ b/parole.spec
@@ -1,5 +1,9 @@
+# by default build the browser plugin
+# use bcond_with to change the default
+%bcond_without mozilla
+
 Name:           parole
-Version:        0.1.91
+Version:        0.1.98
 Release:        1%{?dist}
 Summary:        Media player for the Xfce desktop
 
@@ -7,6 +11,14 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/parole
 Source0:        http://archive.xfce.org/src/apps/parole/0.1/%{name}-%{version}.tar.bz2
+# http://git.xfce.org/apps/parole/commit/?id=c621509e57d326d3134ea61cf783f2d9d311e5db
+Patch0:         parole-0.1.98-fix-vbox-crash.patch
+# http://git.xfce.org/apps/parole/commit/?id=3a276b624edbbe9b6e72101ec8d1893fc854b0af
+Patch1:         parole-0.1.98-browser-plugin-xulrunner-1.9.2.patch
+# http://git.xfce.org/apps/parole/commit/?id=d61475feacd41630cb481f10dbebbb3865a40f61
+Patch2:         parole-0.1.98-interface.patch
+# http://git.xfce.org/apps/parole/patch/?id=aa68a2cb5e6c8162679992b5f979bf4b1d24001c
+Patch3:         parole-0.1.98-memleak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -19,9 +31,10 @@ BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext 
 BuildRequires:  intltool
-# Note from upstream: "No, don't build the doc for now (API for plugins), 
-# it is out of date and will not build."
-#BuildRequires:  gtk-doc
+%if %{with mozilla}
+BuildRequires:  xulrunner-devel
+%endif
+BuildRequires:  gtk-doc
 Requires:       gstreamer-plugins-good
 
 %description
@@ -36,11 +49,23 @@ following features:
 * Playback of live sources
 
 
+%if %{with mozilla}
+%package        mozplugin
+Summary:        Browser plugin for for %{name}
+Requires:       %{name} = %{version}-%{release}
+
+%description    mozplugin
+Parole is a modern simple media player based on the GStreamer framework and 
+written to fit well in the Xfce desktop. This plugin allows it to be embedded
+in a web browser.
+%endif
+
+
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:       gtk-doc
+Requires:       gtk-doc
 
 %description    devel
 The %{name}-devel package contains header files for developing plugins for 
@@ -49,16 +74,24 @@ The %{name}-devel package contains header files for developing plugins for
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .vbox
+%patch1 -p1 -b .192
+%patch2 -p1 -b .interface
+%patch3 -p1 -b .leak
 
 %build
-%configure --disable-static #--enable-gtk-doc
+%configure --disable-static --enable-gtk-doc \
+%if %{with mozilla}
+  --enable-browser-plugin
+%else
+  --disable-browser-plugin
+%endif
 make %{?_smp_mflags} V=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -96,19 +129,38 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_libdir}/%{name}-0/
 %{_libdir}/%{name}-0/*.so
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/%{name}/
 
 
+%if %{with mozilla}
+%files mozplugin
+%defattr(-,root,root,-)
+%{_libexecdir}/%{name}-media-plugin
+%{_libdir}/mozilla/plugins/%{name}-player.so
+%endif
+
+
 %files devel
 %defattr(-,root,root,-)
-#%doc %{_datadir}/gtk-doc/html/%{name}/
+%doc %{_datadir}/gtk-doc/html/Parole-Plugins/
 %{_includedir}/%{name}/
 
 
 %changelog
+* Sun Nov 29 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.98-1
+- Update to 0.1.98
+- Cherry pick some patches to build the browser plugin with xulrunner 1.9.2
+
+* Wed Nov 25 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.96-1
+- Update to 0.1.96
+- Build gtk-doc files
+
+* Wed Nov 25 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.95-1
+- Update to 0.1.95
+
 * Fri Oct 30 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.91-1
-- Update tp 0.1.91
+- Update to 0.1.91
 
 * Thu Oct 08 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.1.90-3
 - Set locale before loading the GtkBuilder interface definition for dialogs
diff --git a/sources b/sources
index 6ffb2de..df7ad27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa1dd951b284fd8ab9b6aec825fe8b86  parole-0.1.91.tar.bz2
+d924759d4205293615deace3f6184bed  parole-0.1.96.tar.bz2