diff --git a/kbackup.spec b/kbackup.spec
index 636436a..3b49c6a 100644
--- a/kbackup.spec
+++ b/kbackup.spec
@@ -1,18 +1,19 @@
 Name:		kbackup
-Version:	0.5.4
-Release:	2%{?dist}
+Version:	0.6.3
+Release:	3%{?dist}
 Summary:	Back up your data in a simple, user friendly way
 Summary(fr):	Sauvegarder vos données de manière simple et conviviale
 
 Group:		Applications/Archiving
 License:	GPLv2
 Url:		http://www.kde-apps.org/content/show.php?content=44998
-Source:		http://members.aon.at/m.koller/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-0.5.4-desktop.patch
-Patch1:         kbackup-0.5.3-gcc43.patch
+Source:		http://kde-apps.org/CONTENT/content-files/44998-%{name}-%{version}.tar.bz2
+Patch0:		%{name}-%{version}-fr.po.diff
+Patch1:		%{name}-%{version}-index.docbook-fr.diff
+Patch2:		%{name}-%{version}-desktop.diff
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils, gettext, kdelibs3-devel
+BuildRequires:	desktop-file-utils, gettext, kdelibs-devel
 
 %description
 KBackup is a program that lets you back up any directories or files,
@@ -32,42 +33,27 @@ stockées compressées (bzip2 ou gzip).
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
-%patch1 -p1 -b .gcc43
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
-
-%configure --disable-rpath
-
-# Parallel building failed, so disable it until this is fixed by upstream
-#%{__make} %{?_smp_mflags}
-%{__make}
+%cmake_kde4
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  --add-category "Application" \
+  --dir %{buildroot}%{_datadir}/applications/kde4 \
   --add-category "Utility" \
   --add-category "X-KDE-Utilities-File" \
   --remove-category "X-SuSE-Backup" \
+  --remove-category "X-MandrivaLinux-System-Archiving-Backup" \
   --remove-category "System" \
   src/%{name}.desktop
 
-# Fix absolute symlink
-%{__rm} -f %{buildroot}%{_docdir}/HTML/*/%{name}/common
-BKP_PWD=`pwd`
-cd %{buildroot}%{_docdir}/HTML/en/%{name}/
-ln -s ../common .
-for lang_dir in de fr
-do
-  cd %{buildroot}%{_docdir}/HTML/$lang_dir/%{name}/
-  ln -s ../docs/common common
-done
-cd $BKP_PWD
-
 %find_lang %{name}
 
 %clean
@@ -75,31 +61,48 @@ cd $BKP_PWD
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]
-then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]
+if [ $1 -eq 0 ]
 then
+  touch --no-create %{_datadir}/icons/hicolor || :
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/*
-%{_datadir}/applications/kde/%{name}.desktop
-%{_datadir}/apps/%{name}/
+%{_datadir}/applications/kde4/%{name}.desktop
+%{_datadir}/kde4/apps/%{name}/
 %{_datadir}/doc/HTML/*/%{name}/
-%{_datadir}/icons/hicolor/*/*/%{name}.png
-%{_datadir}/mimelnk/text/x-kbp.desktop
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sun Jan 10 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.6.3-3
+  - Updated %%defattr macro
+
+* Sat Jan  9 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.6.3-2
+  - Don't add Application category in desktop file
+  - Add update-mime-database in scriptlets
+  - Update gtk-update-icon-cache use in scriptlets
+  - Add %%posttrans scriptlet
+
+* Sat Jan  9 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.6.3-1
+  - New upstream version
+  - Clean spec file for kde4
+  - New patch0 : l10n-fr
+  - New patch1 : update french handbook
+  - New patch2 : Improve desktop entries
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild