diff --git a/dev-util/jd-gui-bin/files/jd-gui.desktop b/dev-util/jd-gui-bin/files/jd-gui.desktop
index 3d14ab436..6ba8b03d3 100644
--- a/dev-util/jd-gui-bin/files/jd-gui.desktop
+++ b/dev-util/jd-gui-bin/files/jd-gui.desktop
@@ -1,7 +1,9 @@
-[Desktop Entry]
-Comment=Java Decompiler JD-GUI
-Terminal=false
-Name=JD-GUI
-Exec=java -jar /opt/jd-gui/jd-gui.jar
-Type=Application
-Icon=jd-gui
+[Desktop Entry]
+Comment=Java Decompiler JD-GUI
+Terminal=false
+Name=JD-GUI
+Exec=java -jar /opt/jd-gui/jd-gui.jar
+Type=Application
+Icon=jd-gui
+MimeType=application/java;application/java-vm;application/java-archive
+StartupWMClass=org-jd-gui-App
diff --git a/dev-util/jd-gui-bin/jd-gui-bin-1.6.6.ebuild b/dev-util/jd-gui-bin/jd-gui-bin-1.6.6-r1.ebuild
similarity index 88%
rename from dev-util/jd-gui-bin/jd-gui-bin-1.6.6.ebuild
rename to dev-util/jd-gui-bin/jd-gui-bin-1.6.6-r1.ebuild
index 0411d9bea..ea7d64297 100644
--- a/dev-util/jd-gui-bin/jd-gui-bin-1.6.6.ebuild
+++ b/dev-util/jd-gui-bin/jd-gui-bin-1.6.6-r1.ebuild
@@ -36,9 +36,6 @@ src_install() {
 	doicon "${FILESDIR}/jd_icon_128.png"
 	domenu "${FILESDIR}/jd-gui.desktop"
 
-#	echo -e "#!/bin/sh\njava -jar /opt/${MY_PN}/${MY_P}.jar >/dev/null 2>&1 &\n" > "${MY_PN}"
-#	dobin "${MY_PN}"
-
 	newbin - ${PN} <<-EOF
 		#!/bin/sh
 		export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on'
@@ -46,3 +43,11 @@ src_install() {
 	EOF
 
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}