diff --git a/kdeutils.spec b/kdeutils.spec
index d812c03..865a7d1 100644
--- a/kdeutils.spec
+++ b/kdeutils.spec
@@ -1,20 +1,21 @@
+
+# Fedora review: http://bugzilla.redhat.com/194375
+
 %define debug 0
 %define final 0
 %define make_cvs 1
 %define arts 1
-%define redhatify 1
 
-%define qt_version 3.3.8
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define appdir %{_datadir}/applications/kde
 
-Version: 3.5.6
-Release: 2%{?dist}
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch: 6
+Version: 3.5.6
+Release: 3%{?dist}
 
 License: GPL
 Group: Applications/System
@@ -33,37 +34,21 @@ Patch3: kdeutils-3.5.4-suspend.patch
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-Requires: usermode
 
 BuildRequires: kdebase-devel
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: automake libtool
 BuildRequires: gettext
 BuildRequires: net-snmp-devel
-BuildRequires: libXtst-devel
 BuildRequires: python-devel
 BuildRequires: gmp-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libXtst-devel
+%endif
+BuildRequires: xmms-devel
 
-Obsoletes: ark
-Obsoletes: kcharselect
-Obsoletes: kdepasswd
-Obsoletes: kdessh
-Obsoletes: kdeutils-laptop
-Obsoletes: kdf
-Obsoletes: kedit
-Obsoletes: kfloppy
-Obsoletes: khexedit
-Obsoletes: kjots
-Obsoletes: kljettool
-Obsoletes: klpq
-Obsoletes: klprfax
-Obsoletes: kregexpeditor
-Obsoletes: kregexpeditor-devel
-Obsoletes: ktimer
-Obsoletes: superkaramba
-Provides:  superkaramba
+%define superkaramba_ver 0.39
+Obsoletes: superkaramba < 0:%{superkaramba_ver}
+Provides:  superkaramba = 0:%{superkaramba_ver}
 
 %description
 Utilities for the K Desktop Environment.
@@ -75,6 +60,7 @@ Includes:
   * kdf (view disk usage);
   * kedit (simple text editor);
   * kfloppy (floppy formatting tool);
+  * kgpg (gpg gui)
   * khexedit (hex editor);
   * kjots (note taker);
   * ktimer (task scheduler);
@@ -86,7 +72,6 @@ Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: %{name}-extras = %{epoch}:%{version}-%{release}
 Requires: kdebase-devel
-
 %description devel
 Development files for kdeutils. Install kdeutils-devel if you wish
 to develop or compile KDE utils applications.
@@ -95,9 +80,7 @@ to develop or compile KDE utils applications.
 Summary: Extras packages from KDEnetwork
 Group: Applications/Internet
 Requires: %{name} = %{epoch}:%{version}-%{release}
-
-Obsoletes: kcalc
-
+Requires: usermode
 %description extras
 More Utilities for the K Desktop Environment:
  * kcalc (scientific calculator);
@@ -182,11 +165,8 @@ done
 fi
 
 # using pam
-install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
-
-install -m 755 -d %{buildroot}%{_sysconfdir}/security/console.apps/
-install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
+install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
 
 pushd %{buildroot}%{_bindir}
   mkdir -p %{buildroot}%{_sbindir}
@@ -195,8 +175,7 @@ pushd %{buildroot}%{_bindir}
 popd
 
 # klaptop setting
-mkdir -p %{buildroot}%{_datadir}/config
-install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
 
 %clean
 rm -rf %{buildroot}
@@ -307,7 +286,6 @@ done
 %exclude %{_datadir}/services/kmilo
 %exclude %{_datadir}/servicetypes/kmilo
 
-
 # ksim
 %exclude %{_docdir}/HTML/??/ksim/
 %exclude %{_libdir}/kde3/ksim*
@@ -364,6 +342,11 @@ done
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Wed May 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-3
+- drop uber-old legacy Obsoletes/Provides
+- BR: xmms-devel
+- -extras: move Requires: usermode here
+
 * Wed Apr 18 2007 Than Ngo <than@redhat.com> - 6:3.5.6-2
 - cleanup