diff --git a/xfce4-taskmanager.spec b/xfce4-taskmanager.spec
index 14a4c21..d4e2567 100644
--- a/xfce4-taskmanager.spec
+++ b/xfce4-taskmanager.spec
@@ -2,14 +2,13 @@
 
 Name:           xfce4-taskmanager
 Version:        1.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Taskmanager for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/%{majorversion}/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfcegui4-devel >= 4.4
 BuildRequires:  gettext, desktop-file-utils, intltool
@@ -28,11 +27,10 @@ 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         \
   --add-category GTK                                      \
   --add-category Monitor                                  \
@@ -42,18 +40,18 @@ desktop-file-install --vendor fedora                      \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %{_bindir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.0.0-6
+- 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> - 1.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild