diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99f54ba54..d2568a9ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ elseif(UNIX) # Linux, BSD etc
 		set(EXAMPLE_CONF_DIR ".")
 		set(MANDIR "unix/man")
 		set(XDG_APPS_DIR "unix/applications")
-		set(APPDATADIR "unix/appdata")
+		set(APPDATADIR "unix/metainfo")
 		set(ICONDIR "unix/icons")
 		set(LOCALEDIR "locale")
 	else()
@@ -92,7 +92,7 @@ elseif(UNIX) # Linux, BSD etc
 		set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
 		set(EXAMPLE_CONF_DIR ${DOCDIR})
 		set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
-		set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
+		set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/metainfo")
 		set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
 		set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale")
 	endif()
@@ -173,8 +173,8 @@ install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX AND NOT APPLE)
 	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
-	install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
-	install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
+	install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
+	install(FILES "misc/net.minetest.minetest.appdata.xml" DESTINATION "${APPDATADIR}")
 	install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
 	install(FILES "misc/minetest-xorg-icon-128.png"
 		DESTINATION "${ICONDIR}/hicolor/128x128/apps"
diff --git a/misc/minetest.appdata.xml b/misc/net.minetest.minetest.appdata.xml
similarity index 69%
rename from misc/minetest.appdata.xml
rename to misc/net.minetest.minetest.appdata.xml
index 65acf96ec..277225d4b 100644
--- a/misc/minetest.appdata.xml
+++ b/misc/net.minetest.minetest.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-	<id type="desktop">minetest.desktop</id>
+<component type="desktop-application">
+	<id>net.minetest.minetest.desktop</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>LGPL-2.1+ and CC-BY-SA-3.0 and MIT and Apache-2.0</project_license>
 	<name>Minetest</name>
@@ -28,9 +28,15 @@
 		</ul>
 	</description>
 	<screenshots>
-		<screenshot type="default" width="1920" height="1080">http://www.minetest.net/media/gallery/1.jpg</screenshot>
-		<screenshot width="1920" height="1080">http://www.minetest.net/media/gallery/3.jpg</screenshot>
-		<screenshot width="1920" height="1080">http://www.minetest.net/media/gallery/5.jpg</screenshot>
+		<screenshot type="default">
+			<image width="1920" height="1080">http://www.minetest.net/media/gallery/1.jpg</image>
+		</screenshot>
+		<screenshot>
+			<image width="1920" height="1080">http://www.minetest.net/media/gallery/3.jpg</image>
+		</screenshot>
+		<screenshot>
+			<image width="1920" height="1080">http://www.minetest.net/media/gallery/5.jpg</image>
+		</screenshot>
 	</screenshots>
 	<keywords>
 		<keyword>sandbox</keyword>
@@ -42,5 +48,11 @@
 	<url type="bugtracker">http://www.minetest.net/development/#reporting-issues</url>
 	<url type="translate">http://dev.minetest.net/Translation</url>
 	<url type="donation">http://www.minetest.net/development/#donate</url>
-	<updatecontact>sfan5@live.de</updatecontact>
-</application>
+	<url type="faq">http://wiki.minetest.net/FAQ</url>
+	<url type="help">http://wiki.minetest.net</url>
+	<provides>
+		<binary>minetest</binary>
+	</provides>
+	<translation type="gettext">minetest</translation>
+	<update_contact>sfan5@live.de</update_contact>
+</component>
diff --git a/misc/minetest.desktop b/misc/net.minetest.minetest.desktop
similarity index 100%
rename from misc/minetest.desktop
rename to misc/net.minetest.minetest.desktop