diff --git a/kdelibs-4.2.0-gcc44-misc.patch b/kdelibs-4.2.0-gcc44-misc.patch
deleted file mode 100644
index 63e580a..0000000
--- a/kdelibs-4.2.0-gcc44-misc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up kdelibs-4.2.0/kdeui/util/fixx11h.h.orig kdelibs-4.2.0/kdeui/util/fixx11h.h
---- kdelibs-4.2.0/kdeui/util/fixx11h.h.orig	2008-05-21 13:08:51.000000000 +0200
-+++ kdelibs-4.2.0/kdeui/util/fixx11h.h	2009-02-26 12:14:01.000000000 +0100
-@@ -251,13 +251,21 @@ const int FontChange = XFontChange;
- #ifndef FIXX11H_index
- #define FIXX11H_index
- inline
-+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
-+char* Xindex( char* s, int c )
-+#else
- char* Xindex( const char* s, int c )
-+#endif
-     {
-     return index( s, c );
-     }
- #undef index
- inline
-+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
-+char* index( char* s, int c )
-+#else
- char* index( const char* s, int c )
-+#endif
-     {
-     return Xindex( s, c );
-     }
-@@ -271,13 +279,21 @@ char* index( const char* s, int c )
- #ifndef FIXX11H_rindex
- #define FIXX11H_rindex
- inline
-+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
-+char* Xrindex( char* s, int c )
-+#else
- char* Xrindex( const char* s, int c )
-+#endif
-     {
-     return rindex( s, c );
-     }
- #undef rindex
- inline
-+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
-+char* rindex( char* s, int c )
-+#else
- char* rindex( const char* s, int c )
-+#endif
-     {
-     return Xrindex( s, c );
-     }
diff --git a/kdelibs-4.2.0-gcc44-workaround.patch b/kdelibs-4.2.0-gcc44-workaround.patch
deleted file mode 100644
index 3530ae2..0000000
--- a/kdelibs-4.2.0-gcc44-workaround.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up kdelibs-4.2.0/cmake/modules/CheckPrototypeExists.cmake.orig kdelibs-4.2.0/cmake/modules/CheckPrototypeExists.cmake
-diff -up kdelibs-4.2.0/ConfigureChecks.cmake.orig kdelibs-4.2.0/ConfigureChecks.cmake
-diff -up kdelibs-4.2.0/kdecore/kdefakes.h.cmake.orig kdelibs-4.2.0/kdecore/kdefakes.h.cmake
---- kdelibs-4.2.0/kdecore/kdefakes.h.cmake.orig	2009-02-16 14:41:16.000000000 +0100
-+++ kdelibs-4.2.0/kdecore/kdefakes.h.cmake	2009-02-16 14:41:47.000000000 +0100
-@@ -57,7 +57,7 @@ unsigned long strlcpy(char*, const char*
- #endif
- #endif
- 
--#cmakedefine HAVE_STRCASESTR_PROTO 1
-+#define HAVE_STRCASESTR_PROTO 1
- #if !defined(HAVE_STRCASESTR_PROTO)
- #ifdef __cplusplus
- extern "C" {
diff --git a/kdelibs.spec b/kdelibs.spec
index 9b41b89..d60cc2a 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,11 +79,10 @@ Patch14: kdelibs-4.0.85-libexecdir.patch
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
 Patch22: kdelibs-4.1.96-cmake.patch
-Patch23: kdelibs-4.2.0-gcc44-workaround.patch
-Patch25: kdelibs-4.2.0-gcc44-misc.patch
 
 # upstream
 # 4.2 branch
+Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -217,11 +216,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
 %patch22 -p1 -b .kdepimlibs-cmake
-%patch23 -p1 -b .gcc44
-%patch25 -p1 -b .gcc44-misc
 
 # upstream patches
 # 4.2
+%patch100 -p1 -b .strcasestr-glibc2.9
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -407,6 +405,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 04 2009 Than Ngo <than@redhat.com> - 4.2.3-2
+- better fix for strcasestr detection
+
 * Sun May 03 2009 Than Ngo <than@redhat.com> - 4.2.3-1
 - 4.2.3