diff --git a/pinta.appdata.xml b/pinta.appdata.xml
new file mode 100644
index 0000000..ce2e803
--- /dev/null
+++ b/pinta.appdata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
+<!--
+EmailAddress: cameronwhite91@gmail.com
+SentUpstream: 2014-03-23
+-->
+<application>
+  <id type="desktop">pinta.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <summary>Edit images and paint digitally</summary>
+  <description>
+    <p>
+      Pinta is a image editing, drawing and painting application with a simple
+      yet powerful interface.
+      Pinta has a wide range of drawing tools, including: freehand, rectangles,
+      circles and lines.
+      It also has over 35 effects to apply to your images, and also has the
+      ability to create unlimited layers to help organize your creativity.
+    </p>
+  </description>
+  <url type="homepage">http://pinta-project.com/</url>
+  <screenshots>
+    <screenshot type="default">http://pinta-project.com/Images/ss1-800.jpg</screenshot>
+    <screenshot>http://pinta-project.com/Images/ss2-800.jpg</screenshot>
+  </screenshots>
+</application>
+
diff --git a/pinta.spec b/pinta.spec
index 659673c..98cbf3b 100644
--- a/pinta.spec
+++ b/pinta.spec
@@ -2,7 +2,7 @@
 
 Name:		pinta
 Version:	1.6
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	An easy to use drawing and image editing program
 
 # the code is licensed under the MIT license while the icons are licensed as CC-BY
@@ -10,13 +10,21 @@ License:	MIT and CC-BY
 URL:		http://pinta-project.com/
 
 Source0:	http://github.com/PintaProject/Pinta/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source1:	%{name}.appdata.xml
 
 # Mono only available on these:
-ExclusiveArch: %mono_arches
-
-Requires:	hicolor-icon-theme, mono-addins
-BuildRequires:	mono-devel, gtk-sharp2-devel, gettext, desktop-file-utils
-BuildRequires:	intltool, mono-addins-devel
+ExclusiveArch:	%mono_arches
+
+BuildRequires:	gcc
+BuildRequires:	mono-devel
+BuildRequires:	mono-addins-devel
+BuildRequires:	gtk-sharp2-devel
+BuildRequires:	gettext
+BuildRequires:	intltool
+BuildRequires:	desktop-file-utils
+BuildRequires:	libappstream-glib
+Requires:	hicolor-icon-theme
+Requires:	mono-addins
 
 %description
 Pinta is an image drawing/editing program.
@@ -40,86 +48,49 @@ sed -i 's/\r//' xdg/pinta.xpm
 sed -i 's/\r//' xdg/pinta.1
 sed -i 's/\r//' xdg/scalable/pinta.svg
 
-%build
-
 # update the project and solution files for mono4
 find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
 find . \( -name "*.csproj" -o -name "*.proj" \) -print -exec sed -i 's#ToolsVersion="3.5"#ToolsVersion="4.0"#g; s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g; s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g; s#Mono.Posix, Version.*"#Mono.Posix"#g' {} \;
 
+
+%build
 %configure
-make %{?_smp_mflags}
+%make_build
+
 
 %install
-make install DESTDIR=%{buildroot}
-
-# Register as an application to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
-<!--
-EmailAddress: cameronwhite91@gmail.com
-SentUpstream: 2014-03-23
--->
-<application>
-  <id type="desktop">pinta.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <summary>Edit images and paint digitally</summary>
-  <description>
-    <p>
-      Pinta is a image editing, drawing and painting application with a simple
-      yet powerful interface.
-      Pinta has a wide range of drawing tools, including: freehand, rectangles,
-      circles and lines.
-      It also has over 35 effects to apply to your images, and also has the
-      ability to create unlimited layers to help organize your creativity.
-    </p>
-  </description>
-  <url type="homepage">http://pinta-project.com/</url>
-  <screenshots>
-    <screenshot type="default">http://pinta-project.com/Images/ss1-800.jpg</screenshot>
-    <screenshot>http://pinta-project.com/Images/ss2-800.jpg</screenshot>
-  </screenshots>
-</application>
-EOF
+%make_install
 
+# Validate desktop file
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%find_lang %name
-  
-%post
-update-desktop-database &> /dev/null ||:
-
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-update-desktop-database &> /dev/null || :
+# Install AppData file
+install -d %{buildroot}%{_datadir}/metainfo
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
 
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
+%find_lang %name
 
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-%doc readme.md license-mit.txt license-pdn.txt
+%license license-mit.txt license-pdn.txt
+%doc readme.md
 %{_libdir}/%{name}
 %{_bindir}/%{name}
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/metainfo/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/%{name}.*
 %{_datadir}/man/man1/%{name}*
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Wed Feb 21 2018 Andrea Musuruane <musuruan@gmail.com> - 1.6-11
+- Added gcc dependency
+- Added license tag
+- Used new AppData directory
+- Removed obsolete scriptlets
+- Spec file clean up
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild