diff --git a/faad2.spec b/faad2.spec
index 4f90941..926f508 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -12,14 +12,14 @@ Summary:	Library and frontend for decoding MPEG2/4 AAC
 Name:		faad2
 Epoch:		1
 Version:	2.7
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.audiocoding.com/faad2.html
 Source:		http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2
 # fix non-PIC objects in libmp4ff.a
 Patch0:		%{name}-pic.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires:	gcc-c++
 BuildRequires:	id3lib-devel
 %{!?_without_sysfs:BuildRequires: libsysfs-devel}
@@ -66,8 +66,7 @@ written from scratch.
 This package contains an input plugin for xmms.
 
 %prep
-%setup -q
-%patch0 -p1 -b .pic
+%autosetup -p1
 find . -name "*.c" -o -name "*.h" | xargs chmod 644
 
 for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do
@@ -84,49 +83,46 @@ done
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-%{__make} %{?_smp_mflags}
+%make_build
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%make_install
 %{__rm} %{buildroot}%{_libdir}/libfaad.la
 %{__rm} %{buildroot}%{xmmsinputplugindir}/libmp4.la
 %{__rm} %{buildroot}%{_includedir}/mp4ff{,int}.h
 %{__rm} %{buildroot}%{_libdir}/libmp4ff.a
-install -dm755 %{buildroot}%{_mandir}/man1
+%{__install} -dm755 %{buildroot}%{_mandir}/man1
 %{__mv} %{buildroot}%{_mandir}/{manm/faad.man,man1/faad.1}
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README*
+%license COPYING
 %{_bindir}/faad
 %{_mandir}/man1/faad.1*
 
 %files libs
-%defattr(-,root,root,-)
 %{_libdir}/libfaad.so.*
 
 %files devel
-%defattr(-, root, root, -)
 %doc TODO docs/Ahead?AAC?Decoder?library?documentation.pdf
 %{_includedir}/faad.h
 %{_includedir}/neaacdec.h
 %{_libdir}/libfaad.so
 
 %files -n xmms-%{name}
-%defattr(-,root,root,-)
 %doc plugins/xmms/AUTHORS plugins/xmms/NEWS
 %doc plugins/xmms/ChangeLog plugins/xmms/README plugins/xmms/TODO
 %{xmmsinputplugindir}/libmp4.so
 
 %changelog
+* Thu Aug 18 2016 Sérgio Basto <sergio@serjux.com> - 1:2.7-7
+- Clean spec, Vascom patches series, rfbz #4200, add license tag
+
 * Mon Sep 01 2014 Sérgio Basto <sergio@serjux.com> - 1:2.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild