diff --git a/kdiff3.spec b/kdiff3.spec
index 82622c2..6b28381 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -1,17 +1,21 @@
 Name:           kdiff3
 Version:        0.9.93
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
-Patch0:		kdiff3part.desktop.diff
+Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gettext cmake
 
-BuildRequires:  kdebase-devel, kdelibs-devel, desktop-file-utils
+# What's the purpose of this patch?  -- Rex 
+Patch0:         kdiff3part.desktop.diff
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdebase4-devel
 
 %description
 KDiff3 is a program that
@@ -27,21 +31,22 @@ KDiff3 is a program that
 %setup -q
 %patch0 -p1
 
+
 %build
-#%configure \
-#         --disable-rpath
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
 
-%{cmake_kde4}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
 
-HTML_DIR=%{_kde4_datadir}/doc/HTML
+make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
 
-# this is junk
-rm -rf $RPM_BUILD_ROOT$HTML_DIR/%{name} 
+HTML_DIR=%{_kde4_docdir}/HTML
 
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -65,41 +70,53 @@ done
 fi
 
 # Desktop.
-mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/apps $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services
-
-desktop-file-install --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+desktop-file-install --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
     $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/kdiff3part.desktop
 
-desktop-file-install  --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
-    --add-category Development \
-    --add-category X-Fedora \
-    --delete-original \
+desktop-file-install  --vendor="" \
+    --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4  \
+    --add-category=Development \
         $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
-touch --no-create %{_kde4_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_kde4_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
+touch --no-create %{_kde4_iconsdir}/locolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/hicolor 2> /dev/null || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_kde4_iconsdir}/icons/locolor 2> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_kde4_bindir}/*
-%{_kde4_libdir}/*
+%{_kde4_bindir}/kdiff3
+%{_kde4_libdir}/kde4/libkdiff3*.so
 %{_kde4_datadir}/applications/kde4/*
-%{_kde4_datadir}/kde4/apps/*
-%{_kde4_datadir}/icons/*/*/*/kdiff3.png
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_appsdir}/kdiff3/
+%{_kde4_iconsdir}/hicolor/*/*/kdiff3.png
+%{_kde4_iconsdir}/locolor/*/*/kdiff3.png
+%{_kde4_datadir}/kde4/services/kdiff3*.desktop
+
 
 %changelog
+* Tue Jan  6 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.9.93-6
+- use kde4 macros
+- add scriptlets for locolor icons
+- update d-f-i usage
+- include khelpcenter handbook
+- update Source0 URL
+
 * Tue Jan  6 2009 Neal Becker <ndbecker2@gmail.com> - 0.9.93-5
 - Fix HTML_DIR and use kde4_ versions of datadir, libdir, bindir