diff --git a/balsa.spec b/balsa.spec
index aeb6865..297cf71 100644
--- a/balsa.spec
+++ b/balsa.spec
@@ -2,14 +2,13 @@
 
 Name:           balsa
 Version:        2.4.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://pawsa.fedorapeople.org/balsa/
 Source0:        http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libesmtp >= 1.0.6
 Requires: scrollkeeper
@@ -30,7 +29,7 @@ BuildRequires: libgnomeui-devel
 BuildRequires: libnotify-devel
 BuildRequires: libtool
 BuildRequires: openssl-devel
-BuildRequires: scrollkeeper
+BuildRequires: rarian-compat
 BuildRequires: unique-devel
 
 %description
@@ -53,27 +52,17 @@ autoreconf -f -i
 
 make %{?_smp_mflags}
 
-
 %install
-rm -rf "$RPM_BUILD_ROOT"
-make install DESTDIR="$RPM_BUILD_ROOT"
+%make_install
 
 desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \
-        --vendor=fedora \
         --add-category=Email \
-	--remove-category=Application \
+        --remove-category=Application \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-        --copy-name-to-generic-name \
-        --delete-original
 
 %find_lang %{name}
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
 %post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-
 /bin/touch --no-create %{_datadir}/icons/hicolor
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -81,15 +70,12 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %postun
-scrollkeeper-update -q || :
-
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc README COPYING ChangeLog NEWS TODO AUTHORS HACKING docs/mh-mail-HOWTO
 %doc docs/vconvert.awk docs/pine2vcard
 %{_bindir}/balsa
@@ -104,8 +90,11 @@ fi
 %{_mandir}/man1/balsa.1*
 %config(noreplace) %{_sysconfdir}/sound/events/balsa.soundlist
 
-
 %changelog
+* Sun Feb 10 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 2.4.12-3
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild