--- keepass-2.19.ebuild
+++ keepass-2.19.ebuild
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aot autotype"
+IUSE="aot"
 
 RDEPEND=">=dev-lang/mono-2.10.5"
 DEPEND="${RDEPEND}
@@ -30,6 +30,7 @@
 
 	# sgen not available on mono
 	epatch "${FILESDIR}/${PN}-2.19-skip-sgen-if-unix.patch"
+
 	# KeePass looks for some XSL files in the same folder as the executable,
 	# we prefer to have it in /usr/share/KeePass
 	epatch "${FILESDIR}/${PN}-2.19-xsl-path-detection.patch"
@@ -63,16 +64,16 @@
 	doexe Build/KeePass/Release/KeePass.exe
 
 	# Copy the AOT compilation result
-        if use aot; then
-                doexe Build/KeePass/Release/KeePass.exe.so
-        fi
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
 
 	# Prepare the icons
 	newicon -s 256 Ext/Icons/Finals/plockb.png "${PN}.png"
 	newicon -s 256 -t gnome -c mimetypes Ext/Icons/Finals/plockb.png "application-x-${PN}2.png"
 
 	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2"
+	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
 
 	# MIME descriptor for .kdbx files
 	insinto /usr/share/mime/packages/
@@ -86,7 +87,7 @@
 pkg_postinst() {
 	gnome2_icon_cache_update
 	fdo-mime_mime_database_update
-        fdo-mime_desktop_database_update
+	fdo-mime_desktop_database_update
 
 	elog "Optional dependencies:"
 	elog "	x11-misc/xdotool (enables autotype)"
@@ -94,4 +95,6 @@
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
 }