diff --git a/cr16-app-kandy.png b/cr16-app-kandy.png
new file mode 100644
index 0000000..6882712
Binary files /dev/null and b/cr16-app-kandy.png differ
diff --git a/cr32-app-kandy.png b/cr32-app-kandy.png
new file mode 100644
index 0000000..2a48f50
Binary files /dev/null and b/cr32-app-kandy.png differ
diff --git a/cr48-app-kandy.png b/cr48-app-kandy.png
new file mode 100644
index 0000000..e92969f
Binary files /dev/null and b/cr48-app-kandy.png differ
diff --git a/kdepim-3.4.0-kandy-icons.patch b/kdepim-3.4.0-kandy-icons.patch
new file mode 100644
index 0000000..f8a8e42
--- /dev/null
+++ b/kdepim-3.4.0-kandy-icons.patch
@@ -0,0 +1,11 @@
+--- kdepim-3.4.0/kandy/src/Makefile.am.tn	2005-03-23 17:17:21.236167534 +0100
++++ kdepim-3.4.0/kandy/src/Makefile.am	2005-03-23 17:19:15.397283296 +0100
+@@ -30,6 +30,8 @@
+ 
+ kde_kcfg_DATA = kandy.kcfg
+ 
++KDE_ICON = kandy
++
+ install-data-local: uninstall.desktop
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Utilities
+ 	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Utilities/kandy.desktop
diff --git a/kdepim.spec b/kdepim.spec
index 9c62447..5f57d72 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -20,12 +20,16 @@ URL: http://www.kde.org
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: korganizerrc
+Source2: cr48-app-kandy.png
+Source3: cr32-app-kandy.png
+Source4: cr16-app-kandy.png
 
 Patch1: kde-libtool.patch
 Patch3: kdepim-3.4.0-s390.patch
 Patch4: kdepim-3.4.0-long.patch
 Patch5: kdepim-3.4.0-gcc4.patch
 Patch6: kdepim-3.4.0-kandy-lockdev.patch
+Patch7: kdepim-3.4.0-kandy-icons.patch
 
 # gcc4 workaround
 Patch100: admin-visibility.patch
@@ -106,14 +110,17 @@ echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot"' >kpilot/configure.in.in
 %patch4 -p1 -b .cast
 %patch5 -p1 -b .gcc4
 %patch6 -p1 -b .lockdev
+%patch7 -p1 -b .kandy-icons
 %patch100 -p1 -b .gcc4_workaround
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNDEBUG -UDEBUG"
+FLAGS="$RPM_OPT_FLAGS"
 export KDEDIR=%{prefix}
 export CFLAGS="$FLAGS "
-export CXXFLAGS="$FLAGS -DQT_THREAD_SUPPORT -fno-use-cxa-atexit"
+export CXXFLAGS="$FLAGS "
+
+cp -f %{SOURCE2} %{SOURCE3} %{SOURCE4} kandy/src
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -199,6 +206,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 23 2005 Than Ngo <than@redhat.com> 6:3.4.0-4
 - add lockdev support patch in kandy from Peter Rockai #84143
+- add missing kandy icons #141165
 
 * Mon Mar 21 2005 Than Ngo <than@redhat.com> 6:3.4.0-3
 - cleanup build dependencies #151673