diff --git a/icu.icu7039.badextract.patch b/icu.icu7039.badextract.patch
index fc3000c..3b27762 100644
--- a/icu.icu7039.badextract.patch
+++ b/icu.icu7039.badextract.patch
@@ -6,7 +6,7 @@ diff -ru icu.orig/source/common/unicode/unistr.h icu/source/common/unicode/unist
  {
    // This dstSize value will be checked explicitly
 -  return extract(start, _length, dst, dst!=0 ? 0xffffffff : 0, codepage);
-+  return extract(start, _length, dst, dst!=0 ? ((dst >= ((size_t)-1) - UINT32_MAX) ? (((char*)UINT32_MAX) - dst) : UINT32_MAX) : 0, codepage);
++  return extract(start, _length, dst, dst!=0 ? (((size_t)dst >= ((size_t)-1) - UINT32_MAX) ? (((char*)UINT32_MAX) - dst) : UINT32_MAX) : 0, codepage);
  }
  
  #endif
diff --git a/icu.spec b/icu.spec
index 628f490..541ec6e 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.2.1
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -14,6 +14,7 @@ Requires: lib%{name} = %{version}-%{release}
 Patch1:  icu-3.4-multiarchdevel.patch
 Patch2:  icu.icu6284.strictalias.patch
 Patch3:  icu.6995.kannada.patch
+Patch4:  icu.icu7039.badextract.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -55,7 +56,8 @@ BuildArch: noarch
 %setup -q -n %{name}
 %patch1 -p1 -b .multiarchdevel
 %patch2 -p1 -b .icu6284.strictalias.patch
-%patch3 -p1 -b .icu.6995.kannada.patch
+%patch3 -p1 -b .icu6995.kannada.patch
+%patch4 -p1 -b .icu7039.badextract.patch
 
 %build
 cd source
@@ -76,6 +78,9 @@ chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}-config
 sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
 sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
 
+%check
+make -C source check
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -131,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Tue Jul 28 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-5
+- icu#7039 fix broken use of extract to get tests working
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild