diff --git a/.cvsignore b/.cvsignore
index bf23588..936dc14 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-emelfm2-0.5.1.tar.bz2
+emelfm2-0.6.0.tar.bz2
diff --git a/emelfm2-0.6.0-fix-segfault-on-upgrade.patch b/emelfm2-0.6.0-fix-segfault-on-upgrade.patch
new file mode 100644
index 0000000..ecce799
--- /dev/null
+++ b/emelfm2-0.6.0-fix-segfault-on-upgrade.patch
@@ -0,0 +1,13 @@
+--- emelfm2-0.6.0.orig/plugins/e2p_upgrade.c	2009-05-05 18:01:17.000000000 +0200
++++ emelfm2-0.6.0/plugins/e2p_upgrade.c	2009-05-09 04:43:56.000000000 +0200
+@@ -132,8 +132,8 @@
+ 		msg, _("update information"), DEFAULT_RESPONSE_CB, NULL);
+ 	e2_dialog_show (dialog, NULL, 0,
+ 		&yes_btn, &no_btn, NULL);
+-//	gint choice = gtk_dialog_run (GTK_DIALOG (dialog));	//not a local loop as options not yet available
+-	gint choice = e2_dialog_run_simple (dialog, NULL);
++	gint choice = gtk_dialog_run (GTK_DIALOG (dialog));	//not a local loop as options not yet available
++//	gint choice = e2_dialog_run_simple (dialog, NULL);
+ 	gtk_widget_destroy (dialog);
+ 	cancelled = (choice != GTK_RESPONSE_YES);
+ 	return choice;
diff --git a/emelfm2.spec b/emelfm2.spec
index 40336bb..567c04f 100644
--- a/emelfm2.spec
+++ b/emelfm2.spec
@@ -5,15 +5,15 @@
 # rpmbuild -ba emelfm2.spec --with hal
 
 Name:           emelfm2
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        File manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPLv3+
 URL:            http://emelfm2.net/
 Source0:        http://emelfm2.net/rel/%{name}-%{version}.tar.bz2
-Patch0:         emelfm2-0.5.1-Makefile.patch
+Patch0:         emelfm2-0.6.0-fix-segfault-on-upgrade.patch
 Patch1:         emelfm2-0.5.1-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +33,8 @@ opening an xterm.
 
 %prep
 %setup -q
-%patch0 -p0 -b .docdir
+#%patch0 -p0 -b .docdir
+%patch0 -p1 -b .segfault
 %patch1 -p1 -b .nostrip
 
 # fix broken icon in emelfm2.desktop
@@ -50,6 +51,7 @@ make %{?_smp_mflags} \
     DOCS_VERSION=1 \
     WITH_TRANSPARENCY=1 \
     WITH_KERNELFAM=1 \
+    WITH_TRACKER=1 \
     USE_LATEST=1 \
     NEW_COMMAND=1 \
     %if 0%{?_with_hal:1}
@@ -91,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT
 
 	
 %changelog
+* Sat May 09 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.6.0-1
+- Update 0.6.0
+- Patch to fix segfault in e2_upgrade.so
+- Enable the tracker plugin
+
 * Fri May  8 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-2
 - Patch to not strip binaries before rpmbuild creates the -debuginfo subpackage (#499885)
 
diff --git a/sources b/sources
index 8442779..3a2cb55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f97784e465b0c29685e057052ca39a18  emelfm2-0.5.1.tar.bz2
+c153749aea954f342b28a470866ac4b0  emelfm2-0.6.0.tar.bz2