diff --git a/icu.changes b/icu.changes
index 778ea7c..1e31ff7 100644
--- a/icu.changes
+++ b/icu.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Sep 13 14:17:38 CEST 2008 - vuntz@novell.com
+
+- Merge with openSUSE:Factory. Redo the patch tags that were done
+  by jpr@novell.com
+
 -------------------------------------------------------------------
 Sat Sep  6 00:54:42 CEST 2008 - maw@suse.de
 
diff --git a/icu.spec b/icu.spec
index e38c242..8badfd5 100644
--- a/icu.spec
+++ b/icu.spec
@@ -24,14 +24,13 @@ License:        X11/MIT
 Group:          System/Libraries
 AutoReqProv:    on
 Version:        4.0
-Release:        2
+Release:        5
 Requires:       libicu = %{version}
 Url:            http://ibm.com/software/globalization/icu
 Source0:        icu4c-4_0-src.tar.bz2
 Source1:        icu4c-4_0-docs.tar.bz2
 Source3:        SuSEconfig.icu
-# OOo-2.3.1 and above needs to access the setBreakType method, see
-# http://bugs.icu-project.org/trac/ticket/5498
+# PATCH-FIX-UPSTREAM icu4c-3_6-src-setBreakType-public.diff --  OOo-2.3.1 and above needs to access the setBreakType method, see http://bugs.icu-project.org/trac/ticket/5498
 Patch:          icu4c-3_6-src-setBreakType-public.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        International Components for Unicode
@@ -232,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/icu/%{version}/UnicodeData.txt
 
 %changelog
+* Sat Sep 13 2008 vuntz@novell.com
+- Merge with openSUSE:Factory. Redo the patch tags that were done
+  by jpr@novell.com
 * Sat Sep 06 2008 maw@suse.de
 - Update to version 4.0:
   (All of the bug numbers listed are against