diff --git a/changelog b/changelog
index 5251553..f55cc69 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,11 @@
----------------
-    0.3.2
----------------
+----------------------------
+    0.3.3 (2008-08-11)
+----------------------------
+- fix an error when opening twofish encrypted databases
+
+----------------------------
+    0.3.2 (2008-07-20)
+----------------------------
 - add default groups when creating a database
 - improved the auto-type dialog (keyboard only usage, visual selection feedback)
 - automatically try to unlock db when global auto-type key has been pressed
diff --git a/share/applications/keepassx.desktop b/share/applications/keepassx.desktop
index 4acd6d2..cd8cfd1 100644
--- a/share/applications/keepassx.desktop
+++ b/share/applications/keepassx.desktop
@@ -1,13 +1,14 @@
 [Desktop Entry]
 Name=KeePassX
 GenericName=Cross Platform Password Manager
-GenericName[fr]=Gestionnaire de mot de passe
 GenericName[de]=Passwortverwaltung
+GenericName[fr]=Gestionnaire de mot de passe
 Exec=keepassx
 Icon=keepassx
 Comment=Cross Platform Password Manager
-Comment[fr]=Gestionnaire de mot de passe
 Comment[de]=Passwortverwaltung
+Comment[fr]=Gestionnaire de mot de passe
 Terminal=false
 Type=Application
 Categories=Qt;Utility;
+MimeType=application/x-keepass
diff --git a/share/mime/packages/keepassx.xml b/share/mime/packages/keepassx.xml
new file mode 100644
index 0000000..5175081
--- /dev/null
+++ b/share/mime/packages/keepassx.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/x-keepass">
+    <comment>KeePass database</comment>
+    <comment xml:lang="de">KeePass Datenbank</comment>
+    <glob pattern="*.kdb"/>
+  </mime-type>
+</mime-info>
diff --git a/share/mimelnk/application/keepassx.desktop b/share/mimelnk/application/keepassx.desktop
new file mode 100644
index 0000000..7840ec2
--- /dev/null
+++ b/share/mimelnk/application/keepassx.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Comment=KeePass database
+Comment[de]=KeePass Datenbank
+Hidden=false
+Icon=keepassx
+MimeType=application/x-keepass
+Patterns=*.kdb
+Type=MimeType
diff --git a/src/src.pro b/src/src.pro
index 41f7ad9..27c04a7 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -40,11 +40,9 @@ unix : !macx : !isEqual(QMAKE_WIN32,1){
 	target.path = $${PREFIX}/bin
 	data.files += ../share/keepassx
 	data.path = $${PREFIX}/share
-	pixmaps.files = ../share/pixmaps/*
-	pixmaps.path = $${PREFIX}/share/pixmaps
-	desktop.files = ../share/applications/*
-	desktop.path = $${PREFIX}/share/applications
-	INSTALLS += pixmaps desktop
+	share.files = ../share/applications ../share/mime ../share/mimelnk ../share/pixmaps
+	share.path = $${PREFIX}/share
+	INSTALLS += share
 	contains(DEFINES,AUTOTYPE){
 		LIBS += -lXtst
 		SOURCES += lib/HelperX11.cpp lib/AutoType_X11.cpp