diff --git a/xfmpc.spec b/xfmpc.spec
index 4d31a4b..4abc868 100644
--- a/xfmpc.spec
+++ b/xfmpc.spec
@@ -1,13 +1,12 @@
 Name:           xfmpc
 Version:        0.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A MPD client for the Xfce desktop environment
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.2/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfce4ui-devel >= 4.8.0
 BuildRequires:  libmpd-devel >= 0.15.0
@@ -30,28 +29,27 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
-desktop-file-install --vendor "fedora"                          \
+desktop-file-install                         \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog IDEAS NEWS README THANKS
 %{_bindir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 0.2.2-5
+- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+- Cleanup spec as per recently changed packaging guidelines
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild