diff --git a/lazarus.appdata.xml b/lazarus.appdata.xml
new file mode 100644
index 0000000..535eb4e
--- /dev/null
+++ b/lazarus.appdata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Edgar Muniz Berlinck <edgar.vv@gmail.com> -->
+<application>
+	<id type="desktop">lazarus.desktop</id>
+	<metadata_license>CC0-1.0</metadata_license>
+	<summary>
+		Create cross-plataform applications using Free Pascal
+	</summary>
+	<description>
+		<p>
+			Lazarus is a free cross-platform IDE for Free Pascal. The environment is similar to Delphi 7	
+			and some of the components found in the LCL - Lazarus Component Library.
+		</p>
+		<p>
+			Lazarus is compatible with some Delphi code, so if you have a standard delphi application
+			using standard components (or other with Lazarus compatible version) you can compile it 
+			with no problems.
+		</p>
+	</description>
+	<url type="homepage">http://www.lazarus.freepascal.org/</url>
+	<screenshots>
+		<screenshot type="default">http://wiki.lazarus.freepascal.org/images/b/b2/Fedora19.png</screenshot>
+		<screenshot>http://wiki.lazarus.freepascal.org/images/0/0e/Error_Build.jpg</screenshot>
+	</screenshots>
+</application>
diff --git a/lazarus.changes b/lazarus.changes
index 7314de9..c712fd1 100644
--- a/lazarus.changes
+++ b/lazarus.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  7 18:31:12 UTC 2017 - mailaender@opensuse.org
+
+- Add an appdata.xml file for https://en.opensuse.org/openSUSE:AppStore
+- Don't package lazarus/components/aggpas/gpc (problematic license)
+
 -------------------------------------------------------------------
 Fri Nov 18 09:21:49 UTC 2016 - aloisio@gmx.com
 
diff --git a/lazarus.spec b/lazarus.spec
index 47f76d7..314c338 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -26,6 +26,8 @@ Summary:        FreePascal RAD IDE and Component Library
 Url:            http://www.lazarus.freepascal.org/
 Group:          Development/Languages/Other
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-0.tar.gz
+# PATCH-FEATURE-UPSTREAM http://mantis.freepascal.org/view.php?id=31364
+Source1:        https://raw.githubusercontent.com/hughsie/fedora-appstream/developerapps/appdata-extra/desktop/lazarus.appdata.xml
 Source90:       %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE lazarus-Makefile_patch.diff -- Change installation path from /usr/share/lazarus to /usr/lib(64)/lazarus
 Patch0:         %{name}-Makefile_patch.diff
@@ -165,6 +167,9 @@ install -Dpm 0644 install/lazarus.desktop %{buildroot}%{_datadir}/applications/%
 # mime info
 install -Dpm 0644 install/%{name}-mime.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
+# software gallery metadata
+install -Dpm 0644 %{S:1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
 # configs
 install -Dpm 0644 tools/install/linux/editoroptions.xml %{buildroot}%{_sysconfdir}/%{name}/editoroptions.xml
 cat tools/install/linux/environmentoptions.xml | sed -e "s#__LAZARUSDIR__#%{_libdir}/%{name}/#" -e "s#__FPCSRCDIR__#%{_datadir}/fpcsrc/#" > %{buildroot}%{_sysconfdir}/%{name}/environmentoptions.xml
@@ -209,10 +214,14 @@ rm -f %{buildroot}%{_libdir}/%{name}/Makefile.fpc.orig
 %{_bindir}/lrstolfm
 %{_bindir}/updatepofiles
 %{_libdir}/%{name}/
+# license is problematic
+%exclude %{_libdir}/%{name}/components/aggpas/gpc
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
 %{_datadir}/pixmaps/lazarus.png
 %{_datadir}/mime/packages/%{name}.xml
+%dir %{_datadir}/appdata/
+%{_datadir}/appdata/%{name}.appdata.xml
 
 %changelog