diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 27fe494..6d90fb0 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -16,7 +16,6 @@ License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
 # po/LINGUAS disaster
-Source1: po.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libgtop2 >= %{libgtop2_version}
@@ -33,6 +32,11 @@ BuildRequires: libtool autoconf automake16
 BuildRequires: intltool scrollkeeper gettext
 BuildRequires: libselinux-devel >= %{libselinux_version}
 
+Requires(post): GConf
+Requires(post): scrollkeeper
+Requires(preun): GConf
+Requires(postun): scrollkeeper
+
 Obsoletes: gtop
 
 %description
@@ -40,15 +44,8 @@ gnome-system-monitor is a simple process and system monitor.
 
 %prep
 %setup -q -n gnome-system-monitor-%{version}
-tar xzf %{SOURCE1}
 
 %build
-# po/LINGUAS disaster
-intltoolize --force
-aclocal
-automake
-
-autoconf
 %configure --enable-selinux
 
 make %{?_smp_mflags}
@@ -73,9 +70,20 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 rm -rf $RPM_BUILD_ROOT
 
 %post
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null
 
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null || :
+fi
+
+%postun 
+scrollkeeper-update -q
+
 %files -f %{name}.lang
 %defattr(-, root, root,-)