diff --git a/.cvsignore b/.cvsignore
index a0ffab1..bd80019 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-brasero-0.5.2.tar.bz2
+brasero-0.6.1.tar.bz2
diff --git a/brasero-0.6.0-open.patch b/brasero-0.6.0-open.patch
new file mode 100644
index 0000000..3648119
--- /dev/null
+++ b/brasero-0.6.0-open.patch
@@ -0,0 +1,12 @@
+--- brasero-0.6.0/src/burn-transcode.c~	2007-07-11 14:48:14.000000000 +0200
++++ brasero-0.6.0/src/burn-transcode.c	2007-08-17 09:17:31.000000000 +0200
+@@ -1402,7 +1402,8 @@
+ 	int fd;
+ 	gboolean result;
+ 
+-	fd = open (transcode->priv->current->dest, O_WRONLY | O_CREAT | O_APPEND);
++	fd = open (transcode->priv->current->dest, O_WRONLY | O_CREAT | O_APPEND,
++		   S_IRWXU | S_IRGRP | S_IROTH);
+ 	if (fd == -1) {
+ 		g_set_error (error,
+ 			     BRASERO_BURN_ERROR,
diff --git a/brasero.spec b/brasero.spec
index 668bb16..66db088 100644
--- a/brasero.spec
+++ b/brasero.spec
@@ -1,12 +1,13 @@
 
 Name:      brasero
-Version:   0.5.2
+Version:   0.6.1
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
-License:   GPL
-URL:       http://perso.orange.fr/bonfire/
-Source0:   http://download.sourceforge.net/bonfire/%{name}-%{version}.tar.bz2
+License:   GPLv2+
+URL:       http://www.gnome.org/projects/brasero/
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/0.6/%{name}-%{version}.tar.bz2
+Patch0:    brasero-0.6.0-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext intltool
@@ -15,10 +16,8 @@ BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  gstreamer-devel >= 0.10.6
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:  nautilus-cd-burner-devel >= 2.16.0
-BuildRequires:  libbeagle-devel >= 0.1.1
 BuildRequires:  totem-devel >= 1.2.0
-BuildRequires:  libburn-devel >= 0.2.3
-BuildRequires:  libisofs-devel >= 0.2.4
+BuildRequires:  libnotify-devel >= 0.3.0
 
 Requires:  dvd+rw-tools
 Requires:  cdrecord
@@ -40,10 +39,16 @@ desktop.
 
 %prep
 %setup -q
+%patch0 -p1 -b .open
 
 
 %build
-%configure --disable-caches --disable-static --disable-schemas-install
+%configure \
+	--disable-caches \
+	--disable-static \
+	--disable-schemas-install \
+	--disable-libburn
+
 make %{?_smp_mflags}
 
 
@@ -55,7 +60,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor ""                   \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
-    --add-category X-Fedora                        \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -64,6 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
+umask 022
 update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -76,6 +81,7 @@ killall -HUP gconfd-2 &>/dev/null || :
 
 
 %postun
+umask 022
 update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -100,7 +106,7 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%doc %{_mandir}/man1/%{name}.*
+%{_mandir}/man1/%{name}.*
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/brasero.desktop
@@ -110,6 +116,11 @@ fi
 
 
 %changelog
+* Thu Dec 13 2007  <denis@poolshark.org> - 0.6.1-1
+- Merging with F-8 spec
+- Update to 0.6.1
+- Removed libbeagle support
+
 * Mon Feb 26 2007 Denis Leroy <denis@poolshark.org> - 0.5.2-1
 - Update to 0.5.2
 - libisofs patch removed, is upstream
diff --git a/sources b/sources
index f46f94c..2b2eb71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c23c4faa958c63b0e5b18c24420682c  brasero-0.5.2.tar.bz2
+fa3b59f06b93bd831805a73a81f3293f  brasero-0.6.1.tar.bz2