diff --git a/ghex.spec b/ghex.spec
index 5029d67..d7822e8 100644
--- a/ghex.spec
+++ b/ghex.spec
@@ -8,18 +8,14 @@ Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://ftp.gnome.org/pub/GNOME/sources/ghex/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/ghex/2.90/ghex-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk3-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  scrollkeeper
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gnome-doc-utils
 BuildRequires:  intltool
-Requires(post): scrollkeeper
 Requires(post): /sbin/ldconfig
-Requires(postun): scrollkeeper
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -44,37 +40,24 @@ developing applications that use %{name}.
 %setup -q
 
 %build
-%configure
+%configure --disable-scrollkeeper
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-desktop-file-install \
-  --delete-original                                        \
-  --vendor fedora                                          \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
-  --add-category X-Fedora                                  \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ghex.desktop
 
 %find_lang %{name}-3.0
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 /sbin/ldconfig
-scrollkeeper-update -q
-
 
 %postun
 /sbin/ldconfig
-scrollkeeper-update -q
 if [ $1 -eq 0 ] ; then
     glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
@@ -84,7 +67,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files -f %{name}-3.0.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-DOCS NEWS README
 %{_bindir}/*
 %{_datadir}/applications/ghex.desktop
@@ -93,13 +75,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome/help/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/%{name}/
-%{_datadir}/%{name}/ghex-ui.xml
 %{_datadir}/omf/%{name}/
-%{_datadir}/omf/%{name}/*
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -110,6 +89,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 - Update to 2.90.2
 - Switch to gsettings
 - Updated description
+- Don't require scrollkeeper
+- Make sure files aren't listed twice in %%files
 
 * Sat Aug 13 2011 Adel Gadllah <adel.gadllah@gmail.com> - 2.90.0-1
 - Update to 2.90.0 - now uses GTK3