diff --git a/.cvsignore b/.cvsignore
index ddb4c6d..be57ede 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1 @@
-icu-2.6.2.tar.gz
-icu-3.4.tgz
-icu4c-3_6_d01-src.tgz
-icu4c-3_6_d02-src.tgz
-icu4c-3_6-src.tgz
+icu4c-3_8_d01-src.tgz
diff --git a/icu.icu5433.oriya.patch b/icu.icu5433.oriya.patch
deleted file mode 100644
index f35f5a2..0000000
--- a/icu.icu5433.oriya.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru icu.orig/source/layout/IndicClassTables.cpp icu/source/layout/IndicClassTables.cpp
---- icu.orig/source/layout/IndicClassTables.cpp	2006-10-03 14:27:47.000000000 +0100
-+++ icu/source/layout/IndicClassTables.cpp	2006-10-03 14:30:07.000000000 +0100
-@@ -120,6 +120,19 @@
-     _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx  // 0AE0 - 0AEF
- };
- 
-+#if 1
-+static const IndicClassTable::CharClass oryaCharClasses[] =
-+{
-+    _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, /* 0B00 - 0B0F */
-+    _iv, _xx, _xx, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _ct, _bb, /* 0B10 - 0B1F */
-+    _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _pb, /* 0B20 - 0B2F */
-+    _rb, _xx, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _xx, _xx, _nu, _xx, _dr, _da, /* 0B30 - 0B3F */
-+    _dr, _db, _db, _db, _xx, _xx, _xx, _dl, _s1, _xx, _xx, _s2, _s3, _vr, _xx, _xx, /* 0B40 - 0B4F */
-+    _xx, _xx, _xx, _xx, _xx, _xx, _da, _dr, _xx, _xx, _xx, _xx, _cn, _cn, _xx, _pb, /* 0B50 - 0B5F */
-+    _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, /* 0B60 - 0B6F */
-+    _xx, _bb                                                                        /* 0B70 - 0B71 */
-+};
-+#else
- static const IndicClassTable::CharClass oryaCharClasses[] =
- {
-     _xx, _ma, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _xx, _iv, // 0B00 - 0B0F
-@@ -131,6 +144,7 @@
-     _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, // 0B60 - 0B6F
-     _xx, _ct                                                                        // 0B70 - 0B71
- };
-+#endif
- 
- static const IndicClassTable::CharClass tamlCharClasses[] =
- {
diff --git a/icu.icu5465.telegu.patch b/icu.icu5465.telegu.patch
deleted file mode 100644
index 7e80103..0000000
--- a/icu.icu5465.telegu.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- icu.orig/source/layout/IndicClassTables.cpp	2007-02-05 14:44:17.000000000 +0000
-+++ icu/source/layout/IndicClassTables.cpp	2007-02-05 14:47:49.000000000 +0000
-@@ -145,6 +145,7 @@
- };
- 
- // FIXME: Should some of the bb's be pb's? (KA, NA, MA, YA, VA, etc. (approx 13))
-+#if 0
- static const IndicClassTable::CharClass teluCharClasses[] =
- {
-     _xx, _mp, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _iv, _iv, // 0C00 - 0C0F
-@@ -155,6 +156,18 @@
-     _xx, _xx, _xx, _xx, _xx, _da, _m2, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, // 0C50 - 0C5F
-     _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx  // 0C60 - 0C6F
- };
-+#else
-+static const IndicClassTable::CharClass teluCharClasses[] =
-+{   
-+    _xx, _mp, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _iv, _iv, /* 0C00 - 0C0F */
-+    _iv, _xx, _iv, _iv, _iv, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, /* 0C10 - 0C1F */
-+    _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _bb, /* 0C20 - 0C2F */
-+    _bb, _bb, _bb, _bb, _xx, _bb, _bb, _bb, _bb, _bb, _xx, _xx, _xx, _xx, _da, _da, /* 0C30 - 0C3F */
-+    _da, _dr, _dr, _dr, _dr, _xx, _da, _da, _s1, _xx, _da, _da, _da, _vr, _xx, _xx, /* 0C40 - 0C4F */
-+    _xx, _xx, _xx, _xx, _xx, _da, _db, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, /* 0C50 - 0C5F */
-+    _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx  /* 0C60 - 0C6F */
-+};
-+#endif
- 
- // U+CC3 and U+CC4 are _lm here not _dr since the Kannada rendering
- // rules want them below and to the right of the entire cluster
diff --git a/icu.icu5488.assamese.patch b/icu.icu5488.assamese.patch
deleted file mode 100644
index 8b5d773..0000000
--- a/icu.icu5488.assamese.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icu.orig/source/layout/IndicClassTables.cpp	2006-10-18 09:05:20.000000000 +0100
-+++ icu/source/layout/IndicClassTables.cpp	2006-11-01 09:26:58.000000000 +0000
-@@ -94,7 +94,7 @@
-     _dr, _db, _db, _db, _db, _xx, _xx, _l1, _dl, _xx, _xx, _s1, _s2, _vr, _xx, _xx, // 09C0 - 09CF
-     _xx, _xx, _xx, _xx, _xx, _xx, _xx, _m2, _xx, _xx, _xx, _xx, _cn, _cn, _xx, _cn, // 09D0 - 09DF
-     _iv, _iv, _dv, _dv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, // 09E0 - 09EF
--    _ct, _ct, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx                           // 09F0 - 09FA
-+    _rv, _ct, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx                           /* 09F0 - 09FA */
- };
- 
- static const IndicClassTable::CharClass punjCharClasses[] =
diff --git a/icu.icu5500.devicetablecrash.patch b/icu.icu5500.devicetablecrash.patch
deleted file mode 100644
index 16ea5b7..0000000
--- a/icu.icu5500.devicetablecrash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icu.orig/source/layout/DeviceTables.cpp	2006-10-18 09:05:20.000000000 +0100
-+++ icu/source/layout/DeviceTables.cpp	2006-11-08 09:08:09.000000000 +0000
-@@ -22,7 +22,7 @@
-     le_uint16 format = SWAPW(deltaFormat) - 1;
-     le_int16 result = 0;
-     
--    if (ppem >= start && ppem <= SWAPW(endSize)) {
-+    if (ppem >= start && ppem <= SWAPW(endSize) && format < sizeof(fieldBits)/sizeof(fieldBits[0])) {
-         le_uint16 sizeIndex = ppem - start;
-         le_uint16 bits = fieldBits[format];
-         le_uint16 count = 16 / bits;
diff --git a/icu.icu5501.sinhala.biggerexpand.patch b/icu.icu5501.sinhala.biggerexpand.patch
deleted file mode 100644
index 6013780..0000000
--- a/icu.icu5501.sinhala.biggerexpand.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icu.orig/source/layout/IndicClassTables.cpp	2006-10-18 09:05:20.000000000 +0100
-+++ icu/source/layout/IndicClassTables.cpp	2006-11-08 11:20:55.000000000 +0000
-@@ -284,7 +284,7 @@
- 
- static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 3, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
- 
--static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 3, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable};
-+static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 4, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable};
- 
- //
- // IndicClassTable addresses
diff --git a/icu.icu5594.gujarati.patch b/icu.icu5594.gujarati.patch
deleted file mode 100644
index b21418d..0000000
--- a/icu.icu5594.gujarati.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- icu.orig/source/layout/IndicClassTables.cpp	2007-02-09 14:26:04.000000000 +0000
-+++ icu/source/layout/IndicClassTables.cpp	2007-02-13 15:41:52.000000000 +0000
-@@ -117,7 +117,11 @@
-     _rv, _xx, _ct, _ct, _xx, _ct, _ct, _ct, _ct, _ct, _xx, _xx, _nu, _xx, _dr, _dl, // 0AB0 - 0ABF
-     _dr, _db, _db, _db, _db, _da, _xx, _da, _da, _dr, _xx, _dr, _dr, _vr, _xx, _xx, // 0AC0 - 0ACF
-     _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, // 0AD0 - 0ADF
-+#if 1
-+    _iv, _xx, _db, _db, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx  // 0AE0 - 0AEF
-+#else
-     _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx  // 0AE0 - 0AEF
-+#endif
- };
- 
- #if 1
diff --git a/icu.spec b/icu.spec
index c9349ed..4f1b59f 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,29 +1,23 @@
 Name:      icu
-Version:   3.6
-Release:   20%{?dist}
+Version:   3.8
+Release:   0.1.d01%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
-URL:       http://www.ibm.com/software/globalization/icu/
-Source0:   ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz
+URL:       http://www.icu-project.org/
+Source0:   http://download.icu-project.org/files/icu4c/3.8/icu4c-3_8_d01-src.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  doxygen, autoconf
+BuildRequires: doxygen, autoconf
 
 Patch1:  icu-3.4-multiarchdevel.patch
 Patch2:  icu-config
 Patch3:  icu.icu5365.dependantvowels.patch
 Patch4:  icu.icu5418.malayam.patch
 Patch5:  icu.icu5431.malayam.patch
-Patch6:  icu.icu5433.oriya.patch
-Patch7:  icu.icuXXXX.virama.prevnext.patch
-Patch8:  icu.icu5465.telegu.patch
-Patch9:  icu.icu5488.assamese.patch
-Patch10: icu.icu5500.devicetablecrash.patch
-Patch11: icu.icu5501.sinhala.biggerexpand.patch
-Patch12: icu.icu5557.safety.patch
-Patch13: icu.icu5506.multiplevowels.patch
-Patch14: icu.icu5594.gujarati.patch
-Patch15: icu.icuXXXX.malayalam.bysyllable.patch
+Patch6:  icu.icuXXXX.virama.prevnext.patch
+Patch7:  icu.icu5557.safety.patch
+Patch8:  icu.icu5506.multiplevowels.patch
+Patch9:  icu.icuXXXX.malayalam.bysyllable.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -66,15 +60,10 @@ Group:   Documentation
 %patch3  -p1 -b .dependantvowels
 %patch4  -p1 -b .icu5418.malayam.patch
 %patch5  -p1 -b .icu5431.malayam.patch
-%patch6  -p1 -b .icu5433.oriya.patch
-%patch7  -p1 -b .icuXXXX.virama.prevnext.patch
-%patch8  -p1 -b .icu5465.telegu.patch
-%patch9  -p1 -b .icu5488.assamese.patch
-%patch10 -p1 -b .icu5500.devicetablecrash.patch
-%patch11 -p1 -b .icu5501.sinhala.biggerexpand.patch
-%patch12 -p1 -b .icu5557.safety.patch
-%patch13 -p1 -b .icu5506.multiplevowels.patch
-%patch15 -p1 -b .icuXXXX.malayalam.bysyllable.patch
+%patch6  -p1 -b .icuXXXX.virama.prevnext.patch
+%patch7  -p1 -b .icu5557.safety.patch
+%patch8  -p1 -b .icu5506.multiplevowels.patch
+%patch9  -p1 -b .icuXXXX.malayalam.bysyllable.patch
 
 %build
 cd source
@@ -141,16 +130,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}
 %{_libdir}/pkgconfig/icu.pc
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/3.6
-%{_datadir}/%{name}/3.6/mkinstalldirs
-%{_datadir}/%{name}/3.6/config
-%doc %{_datadir}/%{name}/3.6/license.html
+%dir %{_datadir}/%{name}/%{version}
+%{_datadir}/%{name}/%{version}/mkinstalldirs
+%{_datadir}/%{name}/%{version}/config
+%doc %{_datadir}/%{name}/%{version}/license.html
 
 %files -n lib%{name}-doc
 %defattr(-,root,root,-)
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Tue Aug 07 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-0.1.d01
+- 3.8 release candidate
+- drop integrated icu.icu5433.oriya.patch
+- drop integrated icu.icu5488.assamese.patch
+- drop integrated icu.icu5500.devicetablecrash.patch
+- drop integrated icu.icu5501.sinhala.biggerexpand.patch
+- drop integrated icu.icu5594.gujarati.patch
+- drop integrated icu.icu5465.telegu.patch
+
 * Wed Jun 13 2007 Caolan McNamara <caolanm@redhat.com> - 3.6-20
 - Resolves: rhbz#243984 change the icu group as it is libicu 
   which is "System Environment/Libraries" not icu
diff --git a/sources b/sources
index def63ef..b6cb606 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6243f7a19e03e05403ce84e597510d4c  icu4c-3_6-src.tgz
+ae40391450c73775e615640308fc3b7a  icu4c-3_8_d01-src.tgz