diff --git a/.gitignore b/.gitignore
index 0f861b2d..ff294210 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ config.*
 configure
 depcomp
 gparted
+gparted.appdata.xml
 gparted.desktop
 gparted.desktop.in
 gpartedbin
diff --git a/Makefile.am b/Makefile.am
index 610f1740..56375284 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,14 +6,18 @@ SUBDIRS = help compose data doc include po src
 endif
 
 @INTLTOOL_DESKTOP_RULE@
-
 DESKTOP_IN_IN_FILES = gparted.desktop.in.in
 DESKTOP_IN_FILES = gparted.desktop.in
 DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop)
-
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+@INTLTOOL_XML_RULE@
+APPDATA_IN_FILES = gparted.appdata.xml.in
+APPDATA_FILES =$(APPDATA_IN_FILES:.xml.in=.xml)
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(APPDATA_FILES)
+
 sbin_SCRIPTS = gparted
 CLEANFILES = $(sbin_SCRIPTS) $(DESKTOP_IN_FILES)
 
@@ -51,6 +55,8 @@ dist-hook:
 	fi
 
 EXTRA_DIST =			\
+	$(APPDATA_IN_FILES)	\
+	$(APPDATA_FILES)	\
 	$(DESKTOP_IN_IN_FILES)	\
 	$(DESKTOP_FILES)	\
 	intltool-extract.in  	\
@@ -60,10 +66,11 @@ EXTRA_DIST =			\
 	gnome-doc-utils.make
 
 DISTCLEANFILES =		\
+	$(appdata_DATA)		\
+	$(desktop_DATA)		\
 	intltool-extract	\
 	intltool-merge		\
 	intltool-update		\
-	$(desktop_DATA)		\
 	gnome-doc-utils.make
 
 DISTCHECK_CONFIGURE_FLAGS =	\
diff --git a/gparted.appdata.xml.in b/gparted.appdata.xml.in
new file mode 100644
index 00000000..b0fa7982
--- /dev/null
+++ b/gparted.appdata.xml.in
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2013 Curtis Gedak <gedakc@users.sf.net> -->
+<application>
+  <id type="desktop">gparted.desktop</id>
+  <licence>GFDL</licence>
+  <description>
+    <p>
+    GParted is a free partition editor for graphically managing your
+    disk partitions.
+    </p>
+    <p>
+    With GParted you can resize, copy, label, and move partitions
+    without data loss.  These actions enable you to grow or shrink
+    your C: drive, create space for new operating systems, or attempt
+    data rescue from lost partitions.
+    </p>
+    <p>
+    GParted works with many file systems including: btrfs, ext2, ext3,
+    ext4, fat16, fat32, hfs, hfs+, linux-swap, lvm2 pv, nilfs2, ntfs,
+    reiserfs, reiser4, ufs, and xfs.
+    </p>
+  </description>
+  <url type="homepage">http://gparted.org</url>
+  <screenshots>
+    <screenshot type="default">http://gparted.org/appdata/gparted-main-window.png</screenshot>
+  </screenshots>
+  <updatecontact>gedakc@users.sf.net</updatecontact>
+  <project_group>GNOME</project_group>
+</application>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 244cf1c3..add73297 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+gparted.appdata.xml.in
 gparted.desktop.in.in
 include/Utils.h
 src/Copy_Blocks.cc