diff --git a/srcpkgs/keepassx2/template b/srcpkgs/keepassx2/template
index 3beeb6dd2e5..9aea4ab3de8 100644
--- a/srcpkgs/keepassx2/template
+++ b/srcpkgs/keepassx2/template
@@ -21,6 +21,10 @@ pre_configure() {
 }
 
 post_install() {
-	sed -i $DESTDIR/usr/share/applications/keepassx2.desktop \
+	sed -i $DESTDIR/usr/share/applications/keepassx.desktop \
 		-e "s/^Exec=.*/Exec=keepassx2/"
+	mv $DESTDIR/usr/share/applications/keepassx.desktop \
+		$DESTDIR/usr/share/applications/keepassx2.desktop
+	mv $DESTDIR/usr/share/mime/packages/keepassx.xml \
+		$DESTDIR/usr/share/mime/packages/keepassx.xml
 }