diff --git a/.cvsignore b/.cvsignore
index 484c18a..ce71f81 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-KeePassX-0.2.2.tar.gz
-KeePassX_logo_100x100.png
+KeePassX-0.3.0.tar.gz
diff --git a/keepass-0.2.2-htmlview.patch b/keepass-0.2.2-htmlview.patch
deleted file mode 100644
index 2b2e194..0000000
--- a/keepass-0.2.2-htmlview.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/PwmConfig.cpp.htmlview	2007-06-27 21:57:50.000000000 +0200
-+++ ./src/PwmConfig.cpp	2007-06-27 21:58:06.000000000 +0200
-@@ -50,7 +50,7 @@ BannerColor1=ParseColorString(ini.GetVal
- BannerColor2=ParseColorString(ini.GetValue("Options","BannerColor2","0,117,175").c_str());
- BannerTextColor=ParseColorString(ini.GetValue("Options","BannerTextColor","222,222,222").c_str());
- ShowPasswords=ini.GetValueB("Options","ShowPasswords",false);
--OpenUrlCommand=ini.GetValue("Options","UrlCmd","kfmclient openURL %1").c_str();
-+OpenUrlCommand=ini.GetValue("Options","UrlCmd","xdg-open %1").c_str();
- Language=ini.GetValue("Options","LangFile","").c_str();
- ParseBoolString(ini.GetValue("Options","SearchOptions",(const char*)defaultSearchOptions.toUtf8()).c_str(),defaultSearchOptions,SearchOptions,9);
- ListView_HidePasswords=ini.GetValueB("UI","HidePasswords",true);
diff --git a/keepassx-0.3.0-xdg.patch b/keepassx-0.3.0-xdg.patch
new file mode 100644
index 0000000..1d65af6
--- /dev/null
+++ b/keepassx-0.3.0-xdg.patch
@@ -0,0 +1,12 @@
+diff -up ./src/PwmConfig.cpp.xdg ./src/PwmConfig.cpp
+--- ./src/PwmConfig.cpp.xdg	2008-02-15 17:03:24.000000000 +0100
++++ ./src/PwmConfig.cpp	2008-03-02 08:21:47.000000000 +0100
+@@ -53,7 +53,7 @@ bool CConfig::loadFromIni(QString filena
+ 	BannerTextColor=ParseColorString(QSTR(ini.GetValue("Options","BannerTextColor","222,222,222")));
+ 	ShowPasswords=ini.GetValueB("Options","ShowPasswords",false);
+ 	ShowPasswordsPasswordDlg=ini.GetValueB("Options","ShowPasswordsPasswordDlg",false);
+-	OpenUrlCommand=QSTR(ini.GetValue("Options","UrlCmd","kfmclient openURL %1"));
++	OpenUrlCommand=QSTR(ini.GetValue("Options","UrlCmd","xdg-open %1"));
+ 	Language=QSTR(ini.GetValue("Options","LangFile",""));
+ 	ParseBoolString(QSTR(ini.GetValue("Options","SearchOptions",(const char*)defaultSearchOptions.toUtf8())),defaultSearchOptions,SearchOptions,9);
+ 	ListView_HidePasswords=ini.GetValueB("UI","HidePasswords",true);
diff --git a/keepassx.spec b/keepassx.spec
index b624c69..0f7a6e4 100644
--- a/keepassx.spec
+++ b/keepassx.spec
@@ -1,15 +1,13 @@
 Name:           keepassx
-Version:        0.2.2
-Release:        5%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://keepassx.sourceforge.net
 Source0:        http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz
-Source1:        http://keepassx.sourceforge.net/images/logos/KeePassX_logo_100x100.png
-Patch0:         keepass-0.2.2-htmlview.patch
-Patch1:         keepassx-0.2.2-helpurl.patch
+Patch0:         keepassx-0.3.0-xdg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel > 4.1, libXtst-devel, ImageMagick, desktop-file-utils
@@ -35,9 +33,8 @@ that is compatible with KeePass Password Safe for MS Windows.
 
 
 %prep
-%setup -q
-%patch0 -p0 -b .htmlview
-%patch1 -p0 -b .helpurl
+%setup -q -n KeePassX-%{version}
+%patch0 -p0 -b .xdg
 
 
 %build
@@ -51,31 +48,20 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# Icons
-for size in 16 22 24 32 48 64 96 128; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps
-  convert -resize ${size}x${size} %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/keepassx.png
-done
-# Fix permissions
-chmod -x $RPM_BUILD_ROOT%{_datadir}/keepass/icons/*.png
+# Use png in _datadir/icons/hicolor instead of xpm in pixmaps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/
+convert $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/keepassx.png
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/keepassx.xpm
 
 # Menu
-cat > %{name}.desktop << EOF
-[Desktop Entry]
-Name=KeePassX
-Comment=Password manager
-Exec=keepass %f
-Icon=keepassx.png
-Type=Application
-MimeType=application/x-keepass;
-EOF
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+sed -i -e 's/keepassx.xpm/keepassx.png/g' -e 's/^Exec=keepassx$/Exec=keepassx %f/g' \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install  --vendor fedora \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category Utility \
-        --add-category Qt \
-        %{name}.desktop
+        --delete-original \
+        --add-mime-type application/x-keepass \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 # Associate KDB files
 cat > x-keepass.desktop << EOF
@@ -112,15 +98,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc share/keepass/license.html
-%{_bindir}/keepass
-%{_datadir}/keepass
+%doc share/keepassx/license.html
+%{_bindir}/keepassx
+%{_datadir}/keepassx
 %{_datadir}/applications/*.desktop
 %{_datadir}/mimelnk/application/*.desktop
 %{_datadir}/icons/hicolor/*/apps/keepassx.png
 
 
 %changelog
+* Sun Mar 02 2008 Aurelien Bompard <abompard@fedoraproject.org> 0.3.0-1
+- version 0.3.0
+- drop helpwindow patch (feature dropped upstream)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.2.2-5
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index 36a0cee..1d1e168 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5ee945ab12c2667ef5c4013a0636c26f  KeePassX-0.2.2.tar.gz
-f3e94f6715798d1f241007e2f882dc0a  KeePassX_logo_100x100.png
+c210b0b33cb01a5b55d87166d9b56242  KeePassX-0.3.0.tar.gz