diff --git a/setup.py b/setup.py
index 82096a70..f42a07c9 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ def find_data_files(uis, scripts):
         # Skip desktop stuff if we don't have any UIs requiring it
         skip_folder = False
         uis_requiring_freedesktop = ('gtk',)
-        freedesktop_folders = ('icons', 'dbus-1', 'applications')
+        freedesktop_folders = ('applications', 'dbus-1', 'icons', 'metainfo')
         for folder in freedesktop_folders:
             share_folder = os.path.join('share', folder)
             if dirpath.startswith(share_folder) and uis is not None:
diff --git a/share/metainfo/org.gpodder.gpodder.appdata.xml b/share/metainfo/org.gpodder.gpodder.appdata.xml
new file mode 100644
index 00000000..cafe091c
--- /dev/null
+++ b/share/metainfo/org.gpodder.gpodder.appdata.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- :indentSize=4:noTabs=true:tabSize=4: -->
+<component type="desktop-application">
+  <id>org.gpodder.gpodder</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>gPodder</name>
+  <summary>Media aggregator and podcast client</summary>
+  <description>
+    <p>gPodder lets you manage your Podcast subscriptions, discover new content and download episodes to your devices.</p>
+    <p>You can also take advantage of the service gpodder.net, which lets you sync subscriptions, playback progress and starred episodes.</p>
+  </description>
+  <launchable type="desktop-id">gpodder.desktop</launchable>
+  <url type="homepage">https://www.gpodder.org</url>
+  <provides>
+    <binary>gpodder</binary>
+  </provides>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">none</content_attribute>
+    <content_attribute id="violence-fantasy">none</content_attribute>
+    <content_attribute id="violence-realistic">none</content_attribute>
+    <content_attribute id="violence-bloodshed">none</content_attribute>
+    <content_attribute id="violence-sexual">none</content_attribute>
+    <content_attribute id="violence-desecration">none</content_attribute>
+    <content_attribute id="violence-slavery">none</content_attribute>
+    <content_attribute id="violence-worship">none</content_attribute>
+    <content_attribute id="drugs-alcohol">none</content_attribute>
+    <content_attribute id="drugs-narcotics">none</content_attribute>
+    <content_attribute id="drugs-tobacco">none</content_attribute>
+    <content_attribute id="sex-nudity">none</content_attribute>
+    <content_attribute id="sex-themes">none</content_attribute>
+    <content_attribute id="sex-homosexuality">none</content_attribute>
+    <content_attribute id="sex-prostitution">none</content_attribute>
+    <content_attribute id="sex-adultery">none</content_attribute>
+    <content_attribute id="sex-appearance">none</content_attribute>
+    <content_attribute id="language-profanity">none</content_attribute>
+    <content_attribute id="language-humor">none</content_attribute>
+    <content_attribute id="language-discrimination">none</content_attribute>
+    <content_attribute id="social-chat">none</content_attribute>
+    <content_attribute id="social-info">none</content_attribute>
+    <content_attribute id="social-audio">none</content_attribute>
+    <content_attribute id="social-location">none</content_attribute>
+    <content_attribute id="social-contacts">none</content_attribute>
+    <content_attribute id="money-purchasing">none</content_attribute>
+    <content_attribute id="money-gambling">none</content_attribute>
+  </content_rating>
+   <screenshots>
+    <screenshot type="default">
+      <caption>The main window</caption>
+      <image>https://raw.githubusercontent.com/flathub/org.gpodder.gpodder/master/screenshot.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="3.10.5" date="2018-09-15">
+        <description>This is a bugfix release, shortly after 3.10.4, for the Rename after Download extension.</description>
+    </release>
+    <release version="3.10.4" date="2018-09-09"/>
+    <release version="3.10.3" date="2018-06-14"/>
+  </releases>
+</component>