diff --git a/.gitignore b/.gitignore
index f8754f90761f16dc633df3b8ae9a9a982f4d59f3..c574434153cfcbb76fb9c91c87ddce4fe66f2827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ core
 *.desktop
 *.desktop.in
 *.service
+thunar.appdata.xml
 gtk-doc.make
 ThunarBulkRename
 Thunar.spec
diff --git a/Makefile.am b/Makefile.am
index ece3b410a135e3030e05afd7517e5538596df182..3c56127043d4b9e04913aeffa78478731f0b7857 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,14 @@ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
+#
+# .appdata
+#
+@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = thunar.appdata.xml.in
+
 if HAVE_DBUS
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.xfce.FileManager.service.in org.xfce.Thunar.service.in
@@ -82,7 +90,10 @@ EXTRA_DIST =								\
 	intltool-merge.in						\
 	intltool-update.in						\
 	$(desktop_in_in_files)						\
-	$(service_in_files)
+	$(service_in_files)						\
+	$(appdata_in_files)
+
+CLEANFILES		= $(appdata_DATA)
 
 DISTCLEANFILES =							\
 	ThunarBulkRename						\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 87561fdff5645b28e0f78c90ec7eba03b6116298..c47182ae90919cec52bea488976085dc77892397 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -129,3 +129,4 @@ Thunar.desktop.in.in
 Thunar-bulk-rename.desktop.in.in
 Thunar-folder-handler.desktop.in.in
 thunar/thunar-settings.desktop.in
+thunar.appdata.xml.in
diff --git a/thunar.appdata.xml.in b/thunar.appdata.xml.in
new file mode 100644
index 0000000000000000000000000000000000000000..2c3fc393bfd6eb99e5a9f72d1f90d300b824bd47
--- /dev/null
+++ b/thunar.appdata.xml.in
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
+
+<application>
+  <id type="desktop">Thunar.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <summary>File Browser</summary>
+  <description>
+    <_p>
+      Thunar is a file browser specifically designed for the XFCE Desktop, but also can
+      serve as an alternate file browser for other Desktop environments. It has a simple,
+      clean two-pane design for browsing all your files.
+    </_p>
+  </description>
+  <url type="homepage">http://xfce.org/projects</url>
+  <url type="bugtracker">https://bugzilla.xfce.org/describecomponents.cgi?product=Thunar</url>
+  <url type="help">http://docs.xfce.org/xfce/thunar/start</url>
+
+  <screenshots>
+    <screenshot type="default">http://docs.xfce.org/_media/xfce/thunar/file-manager-window.png</screenshot>
+  </screenshots>
+
+  <updatecontact>xfce4-dev@xfce.org</updatecontact>
+</application>