diff --git a/aiksaurus.spec b/aiksaurus.spec
index 1a46baf..6e66d44 100644
--- a/aiksaurus.spec
+++ b/aiksaurus.spec
@@ -1,70 +1,61 @@
-Name: 		aiksaurus
-Version: 	1.2.1
-Release: 	26%{?dist}
-Summary: 	An English-language thesaurus library
-
-Epoch: 		1
-Group: 		System Environment/Libraries
-License: 	GPLv2+
-URL: 		http://aiksaurus.sourceforge.net/
-Source0: 	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	%{name}.png
-Source2: 	%{name}.desktop
-Patch0:		%{name}-1.2.1-gcc43.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: 	gtk2-devel
-BuildRequires:	desktop-file-utils
-
-Requires(post): desktop-file-utils
+Name:           aiksaurus
+Version:        1.2.1
+Release:        27%{?dist}
+Summary:        An English-language thesaurus library
+
+Epoch:          1
+Group:          System Environment/Libraries
+License:        GPLv2+
+URL:            http://aiksaurus.sourceforge.net/
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:        %{name}.png
+Source2:        %{name}.desktop
+Patch0:         %{name}-1.2.1-gcc43.patch
+
+BuildRequires:  gtk2-devel
+BuildRequires:  desktop-file-utils
+
+Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 
-
 %description
 Aiksaurus is an English-language thesaurus library that can be 
 embedded in word processors, email composers, and other authoring
 software to provide thesaurus capabilities.  A basic command line 
 thesaurus program is also included.
 
-
 %package devel
-Requires: 	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Summary: 	Files for developing with aiksaurus
-Group: 		Development/Libraries
- 
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:        Files for developing with aiksaurus
+Group:          Development/Libraries
                                                                                
 %description devel
 Includes and definitions for developing with aiksaurus.
 
-
 %package gtk
-Requires: 	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Summary: 	A GTK+ interface for aiksaurus
-Group: 		System Environment/Libraries
-
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:        A GTK+ interface for aiksaurus
+Group:          System Environment/Libraries
 
 %description gtk
 AiksaurusGTK is a GTK+ interface to the Aiksaurus library.
 It provides an attractive thesaurus interface, and can be embedded
 in GTK+ projects, notably AbiWord.
 
-
 %package gtk-devel
-Requires: 	%{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:   %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: 	gtk2-devel
-Summary: 	Files for developing with aiksaurus-gtk
-Group: 		Development/Libraries
- 
+Requires:       %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       gtk2-devel
+Summary:        Files for developing with aiksaurus-gtk
+Group:          Development/Libraries
                                                                                
 %description gtk-devel
 gtk includes and definitions for developing with aiksaurus.
 
-
 %package thesaurus
-Requires: 	%{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release}
-Summary: 	A GTK+ frontend to aiksaurus
-Group: 		Applications/Productivity
+Requires:       %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:        A GTK+ frontend to aiksaurus
+Group:          Applications/Productivity
 
 %description thesaurus
 A standalone thesaurus program base on aiksaurus-gtk.
@@ -75,12 +66,12 @@ A standalone thesaurus program base on aiksaurus-gtk.
 
 %build
 %configure
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool 
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%make_install
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
@@ -88,73 +79,52 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{__install} -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 # Add desktop file.
-desktop-file-install --vendor fedora                    \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --add-category X-Fedora                         \
-        %{SOURCE2}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
 
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
-
-
 %post gtk -p /sbin/ldconfig
-
-
 %postun gtk -p /sbin/ldconfig
 
-
 %post thesaurus
 update-desktop-database &> /dev/null ||:
 
-
 %postun thesaurus
 update-desktop-database &> /dev/null ||:
 
-
 %files
-%defattr(-, root, root)
 %doc ChangeLog README COPYING AUTHORS
 %{_bindir}/%{name}
 %{_bindir}/caiksaurus
 %{_libdir}/*Aiksaurus-*.so.*
 %{_datadir}/%{name}/
 
-
 %files devel
-%defattr(-, root, root)
 %dir %{_includedir}/Aiksaurus
 %{_includedir}/Aiksaurus/Aiksaurus.h
 %{_includedir}/Aiksaurus/AiksaurusC.h
 %{_libdir}/*Aiksaurus.so
 %{_libdir}/pkgconfig/%{name}-1.0.pc
 
-
 %files gtk
-%defattr(-, root, root)
 %{_libdir}/*GTK*.so.*
 
-
 %files gtk-devel
-%defattr(-, root, root)
 %{_includedir}/Aiksaurus/AiksaurusGTK*.h
 %{_libdir}/*GTK*.so
 %{_libdir}/pkgconfig/gaiksaurus-1.0.pc
 
-
 %files thesaurus
-%defattr(-, root, root)
 %{_bindir}/gaiksaurus
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
-
 %changelog
+* Sat Feb 09 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1:1.2.1-27
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+- disable rpath
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.1-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild