diff --git a/leocad.pro b/leocad.pro
index da7d7dc4..4c59919f 100644
--- a/leocad.pro
+++ b/leocad.pro
@@ -138,7 +138,7 @@ unix:!macx {
 	mime.path = $$MIME_DIR
 	mime.files = qt/leocad.xml
 	appdata.path = $$APPDATA_DIR
-	appdata.files = tools/setup/leocad.appdata.xml
+	appdata.files = tools/setup/org.leocad.LeoCAD.appdata.xml
 
 	INSTALLS += target docs man desktop icons mime appdata
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
index e3415159..f88858d5 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -32,7 +32,7 @@ parts:
       - libqt5printsupport5
       - libqt5xml5
     source: https://github.com/leozide/leocad/archive/v26.09.tar.gz
-    parse-info: [usr/share/metainfo/leocad.appdata.xml]
+    parse-info: [usr/share/metainfo/org.leocad.LeoCAD.appdata.xml]
   library:
     source: .
     plugin: dump
diff --git a/tools/setup/leocad.appdata.xml b/tools/setup/org.leocad.LeoCAD.appdata.xml
similarity index 89%
rename from tools/setup/leocad.appdata.xml
rename to tools/setup/org.leocad.LeoCAD.appdata.xml
index 9f13797d..31898605 100644
--- a/tools/setup/leocad.appdata.xml
+++ b/tools/setup/org.leocad.LeoCAD.appdata.xml
@@ -11,8 +11,8 @@
 	</description>
 	<launchable type="desktop-id">leocad.desktop</launchable>
 	<url type="homepage">https://www.leocad.org/</url>
-  <url type="bugtracker">https://github.com/leozide/leocad/issues</url>
-  <developer_name>LeoCAD.org</developer_name>
+	<url type="bugtracker">https://github.com/leozide/leocad/issues</url>
+	<developer id="org.leocad"><name>LeoCAD.org</name></developer>
 	<screenshots>
 		<screenshot type="default">
 			<image>https://www.leocad.org/towerbridge.png</image>