diff --git a/.cvsignore b/.cvsignore
index f61dc82..5c2c5d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-brasero-0.7.1.tar.bz2
+brasero-0.8.4.tar.bz2
diff --git a/brasero-0.7.0-open.patch b/brasero-0.7.0-open.patch
deleted file mode 100644
index 55230a3..0000000
--- a/brasero-0.7.0-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- brasero-0.7.0/src/plugins/transcode/burn-transcode.c.orig	2007-12-30 11:17:45.000000000 +0100
-+++ brasero-0.7.0/src/plugins/transcode/burn-transcode.c	2007-12-30 11:18:02.000000000 +0100
-@@ -931,7 +931,7 @@
- 
- 	output = NULL;
- 	brasero_job_get_audio_output (BRASERO_JOB (transcode), &output);
--	fd = open (output, O_WRONLY | O_CREAT | O_APPEND);
-+	fd = open (output, O_WRONLY | O_CREAT | O_APPEND, S_IRWXU | S_IRGRP | S_IROTH);
- 	g_free (output);
- 
- 	if (fd == -1) {
diff --git a/brasero-0.8.4-dvdcss.patch b/brasero-0.8.4-dvdcss.patch
new file mode 100644
index 0000000..9923b6e
--- /dev/null
+++ b/brasero-0.8.4-dvdcss.patch
@@ -0,0 +1,11 @@
+--- brasero-0.8.4/src/plugins/dvdcss/burn-dvdcss.c.orig	2008-12-14 04:53:07.000000000 -0800
++++ brasero-0.8.4/src/plugins/dvdcss/burn-dvdcss.c	2009-02-07 10:59:24.000000000 -0800
+@@ -77,7 +77,7 @@
+ 		return TRUE;
+ 
+ 	/* load libdvdcss library and see the version (mine is 1.2.0) */
+-	module = g_module_open ("libdvdcss.so", G_MODULE_BIND_LOCAL);
++	module = g_module_open ("libdvdcss.so.2", G_MODULE_BIND_LOCAL);
+ 	if (!module)
+ 		goto error_doesnt_exist;
+ 
diff --git a/brasero.spec b/brasero.spec
index ad34e21..7fc767c 100644
--- a/brasero.spec
+++ b/brasero.spec
@@ -1,31 +1,34 @@
 
 Name:      brasero
-Version:   0.7.1
-Release:   3%{?dist}
+Version:   0.8.4
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/0.7/%{name}-%{version}.tar.bz2
-Patch0:    brasero-0.7.0-open.patch
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/0.8/%{name}-%{version}.tar.bz2
+Patch0:    brasero-0.8.4-dvdcss.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gettext intltool
+BuildRequires:  glib2-devel >= 2.15.6
+BuildRequires:  gettext intltool gtk-doc
 BuildRequires:  desktop-file-utils
-BuildRequires:  gnome-vfs2-devel >= 2.14.2
+BuildRequires:  GConf2-devel >= 2.0.0
+BuildRequires:  hal-devel >= 0.5
 BuildRequires:  libgnomeui-devel >= 2.10.0
-BuildRequires:  gstreamer-devel >= 0.10.6
+BuildRequires:  gstreamer-devel >= 0.10.15
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires:  nautilus-cd-burner-devel >= 2.16.0
 %ifnarch ppc64
 BuildRequires:  libbeagle-devel >= 0.1.1
 %endif
-BuildRequires:  totem-pl-parser-devel >= 2.20.0
+BuildRequires:  totem-pl-parser-devel >= 2.22.0
 BuildRequires:  libnotify-devel >= 0.3.0
 BuildRequires:  libxml2-devel >= 2.6.0
 BuildRequires:  dbus-glib-devel >= 0.7.2
-BuildRequires:  libburn-devel >= 0.4.0
-BuildRequires:  libisofs-devel >= 0.2.8
+BuildRequires:  gnome-doc-utils >= 0.3.2
+BuildRequires:  scrollkeeper
+BuildRequires:  nautilus-devel >= 2.22.2
+BuildRequires:  eel2-devel >= 2.13.3
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord
@@ -47,12 +50,13 @@ desktop.
 
 %prep
 %setup -q
-%patch0 -p1 -b .open
+%patch0 -p1 -b .dvdcss
 
 
 %build
 %configure \
 	--enable-dbus \
+	--enable-nautilus \
 	--enable-preview \
 	--disable-caches \
 	--disable-static \
@@ -65,6 +69,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
 sed -i 's/cd:x/cd;x/' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -120,14 +125,22 @@ fi
 %{_mandir}/man1/%{name}.*
 %{_bindir}/*
 %{_libdir}/%{name}
+%{_libdir}/nautilus/extensions-2.0/*.so
 %{_datadir}/%{name}
-%{_datadir}/applications/brasero.desktop
+%{_datadir}/applications/*.desktop
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/omf/%{name}
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/*
 %config %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 
 %changelog
+* Thu May 14 2009 Denis <denis@poolshark.org> - 0.8.4-1
+- Update to upstream 0.8.4
+- Some spec merges from F-10 branch
+- Don't build libburn plugins
+
 * Sat Feb 23 2008 Denis Leroy <denis@poolshark.org> - 0.7.1-3
 - Fixed desktop mime field
 
diff --git a/sources b/sources
index b3a6ccf..8789ed2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2754fca21c31f00016981cc8fe7c48be  brasero-0.7.1.tar.bz2
+5d0ad796e1f7b68a31f8757f1b3f9aef  brasero-0.8.4.tar.bz2