diff --git a/.cvsignore b/.cvsignore
index f307563..90c4f8b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-yakuake-2.9.6.tar.bz2
+yakuake-2.9.7.tar.bz2
diff --git a/sources b/sources
index f588ca7..38ca606 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5cbb912596fd1b3a92fdb04fe46cee0  yakuake-2.9.6.tar.bz2
+c5a6d1f50ab9464d62563cdb18d6afb7  yakuake-2.9.7.tar.bz2
diff --git a/yakuake.spec b/yakuake.spec
index 6838395..08ae0fc 100644
--- a/yakuake.spec
+++ b/yakuake.spec
@@ -1,6 +1,11 @@
+
+%if 0%{?fedora} && 0%{?fedora} < 14
+%define dt_vendor fedora
+%endif
+
 Name:           yakuake
-Version:        2.9.6
-Release:        2%{?dist}
+Version:        2.9.7
+Release:        1%{?dist}
 Summary:        Terminal emulator
 
 Group:          User Interface/Desktops
@@ -9,13 +14,12 @@ URL:            http://extragear.kde.org/apps/yakuake/
 Source0:        http://download.berlios.de/yakuake/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       kdebase
+# konsolepart
+Requires:       kdebase4%{?_kde4_version:>= %{_kde4_version}}
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  kdelibs-devel
-BuildRequires:  cmake
-BuildRequires:  chrpath
+BuildRequires:  kdelibs4-devel
 
 %description
 Yakuake is a "Quake console" like terminal emulator.
@@ -26,40 +30,49 @@ Yakuake is a "Quake console" like terminal emulator.
 
 
 %build
-%{cmake_kde4}
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category Application                              \
-        --add-category Utility                                  \
-        --add-category KDE                                      \
-        --add-category Qt                                       \
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+## --vendor is discouraged/deprecated these days -- Rex
+%if 0%{?dt_vendor:1} 
+desktop-file-install --vendor=%{dt_vendor}                      \
+        --dir=%{buildroot}%{_kde4_datadir}/applications         \
+        --add-category=Utility                                  \
         --delete-original                                       \
-        %{buildroot}%{_datadir}/applications/kde4/yakuake.desktop
+        %{buildroot}%{_kde4_datadir}/applications/kde4/yakuake.desktop
+%endif
 
 %find_lang %{name}
 
 
+%check
+%if ! 0%{?dt_vendor:1}
+desktop-file-validate  %{buildroot}%{_kde4_datadir}/applications/kde4/yakuake.desktop
+%endif
+
+
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x ${_bindir}/gtk-update-icon-cache ] ; then
-        ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x ${_bindir}/gtk-update-icon-cache ] ; then
-        ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
 
-
 %clean
 rm -rf %{buildroot}
 
@@ -67,14 +80,22 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
-%{_bindir}/yakuake
-%{_datadir}/applications/*yakuake.desktop
-%{_datadir}/kde4/apps/yakuake
-%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
-%{_datadir}/icons/hicolor/???x???/apps/%{name}.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
+%{_kde4_bindir}/yakuake
+%if 0%{?dt_vendor:1}
+%{_kde4_datadir}/applications/%{dt_vendor}-yakuake.desktop
+%else
+%{_kde4_datadir}/applications/kde4/yakuake.desktop
+%endif
+%{_kde4_appsdir}/yakuake/
+%{_kde4_iconsdir}/hicolor/*/*/*
+
 
 %changelog
+* Sun Jul 18 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.9.7-1
+- 2.9.7
+- optimize scriptlets
+- use _kde4_ macros
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild