diff --git a/.cvsignore b/.cvsignore
index bf1ac44..35e55f7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gparted-0.3.8.tar.bz2
+gparted-0.3.9.tar.bz2
diff --git a/gparted.spec b/gparted.spec
index a8cfb2a..8add398 100644
--- a/gparted.spec
+++ b/gparted.spec
@@ -1,17 +1,20 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.3.8
+Version:	0.3.9
 Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://gparted.sourceforge.net
-Source0:	http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	gparted-console.apps
 Source2:	gparted-pam.d
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtkmm24-devel parted-devel 
 BuildRequires:	e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires:	desktop-file-utils
+BuildRequires:  scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 Requires:	hal >= 0.5.9
 
 %description
@@ -55,12 +58,11 @@ cp %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/gparted
 %clean
 rm -rf %{buildroot}
 
-%preun
-if [ $1 -ge 0 ]; then
-    if [ -a %{_datadir}/hal/fdi/policy/gparted-disable-automount.fdi ]; then
-       rm -rf %{_datadir}/hal/fdi/policy/gparted-disable-automount.fdi
-    fi
-fi
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun
+scrollkeeper-update -q || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -70,11 +72,18 @@ fi
 %{_sbindir}/gpartedbin
 %{_datadir}/applications/fedora-gparted.desktop
 %{_datadir}/pixmaps/gparted.png
+%{_datadir}/gnome/help/gparted/
+%{_datadir}/omf/gparted/
 %{_mandir}/man8/gparted.*
 %config(noreplace) %{_sysconfdir}/pam.d/gparted
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Sep 22 2008 Deji Akingunola <dakingun@gmail.com> - 0.3.9-1
+- New upstream version
+- Finally removed the 'preun' call that ensures the old gparted fdi (pre-FC6)
+  file is removed on update
+
 * Sun Jul 13 2008 Deji Akingunola <dakingun@gmail.com> - 0.3.8-1
 - New upstream version
 
diff --git a/sources b/sources
index fee303f..3ef0687 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c890472168b0b5e5f353b445758ab3f  gparted-0.3.8.tar.bz2
+5b6dc1b154322c9721fce5fd5b9e066e  gparted-0.3.9.tar.bz2