diff --git a/driconf.spec b/driconf.spec
index ba16c88..913e2e6 100644
--- a/driconf.spec
+++ b/driconf.spec
@@ -1,8 +1,6 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:           driconf
 Version:        0.9.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A configuration applet for the Direct Rendering Infrastructure
 
 Group:          User Interface/X
@@ -10,17 +8,16 @@ License:        GPLv2+
 URL:            http://dri.freedesktop.org/wiki/DriConf
 Source0:        http://people.freedesktop.org/~fxkuehl/driconf/driconf-%{version}.tar.gz
 Patch1:         driconf-0.9.1-setup.patch
-Patch2:		driconf-0.9.1-glxinfo-unicode.patch
-Patch3:		driconf-0.9.1-update-toolbar-methods.patch
+Patch2:         driconf-0.9.1-glxinfo-unicode.patch
+Patch3:         driconf-0.9.1-update-toolbar-methods.patch
 Patch4:         http://patch-tracking.debian.net/patch/misc/dl/driconf/0.9.1-2/driconf_simpleui.py
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
 BuildArch:      noarch
-Requires:	pygtk2
-Requires:	glx-utils
+Requires:       pygtk2
+Requires:       glx-utils
 
 %description
 DRIconf is a configuration applet for the Direct Rendering Infrastructure. 
@@ -43,7 +40,6 @@ DRIConf is written in Python with the python-gtk toolkit bindings.
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
 
 %find_lang driconf
@@ -53,21 +49,16 @@ cat << EOF > %{name}.desktop
 Name=Driconf
 Comment=configuration applet for the Direct Rendering Infrastructure
 Exec=/usr/bin/driconf
-Icon=/usr/share/driconf/driconf-icon.png
+Icon=/usr/share/driconf/driconf-icon
 Terminal=false
 Type=Application
-Encoding=UTF-8
 Categories=Settings;
 EOF
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f driconf.lang
-%defattr(-,root,root,-)
 %doc COPYING CHANGELOG README TODO
 %{_bindir}/driconf
 %{python_sitelib}/dri.py
@@ -92,9 +83,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/driconf/screen.png
 %{_datadir}/driconf/screencard.png
 %{_datadir}/driconf/driconf-icon.png
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Feb 24 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 0.9.1-19
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild