diff --git a/audacious.appdata.xml b/audacious.appdata.xml
index c45abd1..046b9e3 100644
--- a/audacious.appdata.xml
+++ b/audacious.appdata.xml
@@ -1,29 +1,32 @@
+<!-- Copyright 2015 Audacious developers -->
+
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-<id type="desktop">audacious.desktop</id>
-<licence>CC0</licence>
-<description>
-<p>
-Audacious is an open source audio player. Originally a descendant of XMMS,
-Audacious plays your music how you want it, without stealing away your
-computer’s resources from other tasks.
-</p>
-<p>
-Drag and drop folders and individual song files, search for artists and
-albums in your entire music library, or create and edit your own custom
-playlists. Listen to CD’s or stream music from the Internet. Tweak the
-sound with the graphical equalizer or experiment with LADSPA
-effects. Enjoy the modern GTK-themed interface or change things up with
-Winamp Classic skins. Use the plugins included with Audacious to fetch
-lyrics for your music, to set an alarm in the morning, and more.
-</p>
-</description>
-<!--
-<screenshots>
-<screenshot type="default" width="894" height="585">http://audacious-media-player.org/images/audacious-3.3.png</screenshot>
-</screenshots>
--->
-<url type="homepage">http://audacious-media-player.org/</url>
-<!-- temporary -->
-<updatecontact>audacious-owner_at_fedoraproject.org</updatecontact>
-</application>
+<component>
+  <id type="desktop">audacious.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>BSD-2-Clause</project_license>
+  <name>Audacious</name>
+  <summary>Lightweight audio player</summary>
+  <description>
+    <p>
+      Audacious is an open source audio player. Originally a descendant of XMMS,
+      Audacious plays your music how you want it, without stealing away your
+      computer’s resources from other tasks.
+    </p>
+    <p>
+      Drag and drop folders and individual song files, search for artists and
+      albums in your entire music library, or create and edit your own custom
+      playlists. Listen to CD’s or stream music from the Internet. Tweak the
+      sound with the graphical equalizer or experiment with LADSPA
+      effects. Enjoy the modern GTK-themed interface or change things up with
+      Winamp Classic skins. Use the plugins included with Audacious to fetch
+      lyrics for your music, to set an alarm in the morning, and more.
+    </p>
+  </description>
+  <url type="homepage">http://audacious-media-player.org</url>
+  <screenshots>
+    <screenshot type="default">http://audacious-media-player.org/images/gtk-interface.png</screenshot>
+    <screenshot>http://audacious-media-player.org/images/winamp-interface.png</screenshot>
+    <screenshot>http://audacious-media-player.org/images/settings-window.png</screenshot>
+  </screenshots>
+</component>
diff --git a/audacious.spec b/audacious.spec
index e4b1bbe..2b1d0c0 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -7,7 +7,7 @@
 
 Name: audacious
 Version: 3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if %{with gtk2}
   %global tar_ver %{version}
@@ -26,10 +26,11 @@ URL: http://audacious-media-player.org/
 Group: Applications/Multimedia
 
 Source0: http://distfiles.audacious-media-player.org/%{name}-%{tar_ver}.tar.bz2
-# validated: 2013-11-03 / screenshot commented out for now
-# Audacious 3.6 contains an appdata file in contrib dir, but it doesn't
-# validate yet
-Source1: audacious.appdata.xml
+
+# 2015-03-08:
+#   $ appstream-util validate-relax audacious.appdata.xml
+#   audacious.appdata.xml: OK
+Source1: https://raw.githubusercontent.com/audacious-media-player/audacious/master/contrib/audacious.appdata.xml
 
 # for /usr/bin/appstream-util
 BuildRequires: libappstream-glib
@@ -203,6 +204,10 @@ fi
 
 
 %changelog
+* Sun Mar  8 2015 Michael Schwendt <mschwendt@fedoraproject.org> - 3.6-5
+- Merge latest appdata file git master as suggested by Thomas Lange.
+  Screenshots are enabled now.
+
 * Wed Mar  4 2015 Michael Schwendt <mschwendt@fedoraproject.org> - 3.6-4
 - Following Fedora Packaging:AppData guidelines and validate the appdata
   file in %%install. No (re)build just for this change.