diff --git a/lib/main.cpp b/lib/main.cpp
index 5e12ade3..e8a04b24 100644
--- a/lib/main.cpp
+++ b/lib/main.cpp
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 	UI_set_default_method(uimeth.data());
 
 	coreApp->setApplicationName(PACKAGE_TARNAME);
-	coreApp->setOrganizationDomain("de.hohnstaedt");
+	coreApp->setOrganizationDomain("hohnstaedt.de");
 	coreApp->setApplicationVersion(XCA_VERSION);
 	xcaWarning::setGui(new xcaWarningCore());
 
diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
index 09088f2c..aa6af143 100644
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@@ -56,7 +56,7 @@ if (UNIX AND NOT APPLE)
   install(FILES ${TEXT_FILES} ${XCA_TEMPLATES}
         DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
   )
-  install(FILES misc/xca.desktop
+  install(FILES misc/de.hohnstaedt.xca.desktop
         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
   )
   install(FILES misc/xca.completion
diff --git a/misc/xca.desktop b/misc/de.hohnstaedt.xca.desktop
similarity index 95%
rename from misc/xca.desktop
rename to misc/de.hohnstaedt.xca.desktop
index d0b5488f..46b669fb 100644
--- a/misc/xca.desktop
+++ b/misc/de.hohnstaedt.xca.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=XCA
 Type=Application
 Comment=A graphical user interface for handling and issuing X.509 compliant Certificates
@@ -15,5 +14,5 @@ Comment[it]=Interfaccia grafica per generare e gestire certificati X.509
 Exec=xca %F
 Icon=de.hohnstaedt.xca
 Terminal=false
-Categories=Application;Utility;Qt;
+Categories=Utility;Qt
 MimeType=application/x-xca-database;application/x-xca-template;application/x-x509-ca-cert;application/pkcs10;application/x-pkcs7-certificates;application/x-pkcs12;