diff --git a/data/Makefile.am b/data/Makefile.am
index 821c171..55718d9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -76,6 +76,11 @@ mimedir = $(datadir)/mime/packages
 mime_DATA = virt-viewer-mime.xml
 @INTLTOOL_XML_RULE@
 
+appdatadir       = $(datadir)/appdata
+APPDATAFILES     = remote-viewer.appdata.xml.in
+appdata_DATA     = $(APPDATAFILES:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
 install-data-hook:
 if ENABLE_UPDATE_MIMEDB
 	@if $(AM_V_P); then set -x; else echo "  INSTALL  update-mime-database"; fi; \
@@ -88,8 +93,8 @@ if ENABLE_UPDATE_MIMEDB
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime";
 endif
 
-CLEANFILES += $(mime_DATA) $(desktop_DATA)
-EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES)
+CLEANFILES += $(mime_DATA) $(desktop_DATA) $(appdata_DATA)
+EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES) $(APPDATAFILES)
 
 endif
 
diff --git a/data/remote-viewer.appdata.xml.in b/data/remote-viewer.appdata.xml.in
new file mode 100644
index 0000000..3f6017d
--- /dev/null
+++ b/data/remote-viewer.appdata.xml.in
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+ <id type="desktop">remote-viewer.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <_name>Remote Viewer</_name>
+ <_summary>Remotely access virtual machines</_summary>
+ <description>
+  <_p>
+    Remote Viewer provides a graphical viewer for the guest OS
+    display. At this time it supports guest OS using the VNC
+    or SPICE protocols. Further protocols may be supported in
+    the future as user demand dictates. The viewer can connect
+    directly to both local and remotely hosted guest OS, optionally
+    using SSL/TLS encryption.
+  </_p>
+ </description>
+ <screenshots>
+  <screenshot type="default">https://virt-manager.org/appdata/en_US/virt-viewer/general.png</screenshot>
+  <screenshot>https://virt-manager.org/appdata/en_US/virt-viewer/connection.png</screenshot>
+  <screenshot>https://virt-manager.org/appdata/en_US/virt-viewer/usbredir.png</screenshot>
+  <screenshot>https://virt-manager.org/appdata/en_US/virt-viewer/shared_folder.png</screenshot>
+ </screenshots>
+ <provides>
+  <binary>remote-viewer</binary>
+ </provides>
+ <url type="homepage">https://virt-manager.org/</url>
+ <updatecontact>virt-tools-list_at_redhat.com</updatecontact>
+</application>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b25306d..6775f53 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+data/remote-viewer.appdata.xml.in
 data/remote-viewer.desktop.in
 data/virt-viewer-mime.xml.in
 src/remote-viewer-main.c
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index f3661d2..7e972c4 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -125,6 +125,7 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/devices/*
 %{_datadir}/applications/remote-viewer.desktop
+%{_datadir}/appdata/remote-viewer.appdata.xml
 %{_datadir}/mime/packages/virt-viewer-mime.xml
 %ghost %{_libexecdir}/spice-xpi-client
 %{_libexecdir}/spice-xpi-client-remote-viewer