diff --git a/.cvsignore b/.cvsignore
index 7218f41..b4636e1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rmol-0.20.0.tar.gz
+rmol-0.21.0.tar.gz
diff --git a/import.log b/import.log
index 12e656b..0646dfe 100644
--- a/import.log
+++ b/import.log
@@ -3,3 +3,4 @@ rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241395329
 rmol-0_20_0-1_fc10:HEAD:rmol-0.20.0-1.fc10.src.rpm:1241396502
 rmol-0_20_0-2_fc10:HEAD:rmol-0.20.0-2.fc10.src.rpm:1241397825
 rmol-0_20_0-3_fc10:HEAD:rmol-0.20.0-3.fc10.src.rpm:1241398758
+rmol-0_21_0-2_fc11:HEAD:rmol-0.21.0-2.fc11.src.rpm:1241914851
diff --git a/rmol.spec b/rmol.spec
index 08041a0..f315dc7 100644
--- a/rmol.spec
+++ b/rmol.spec
@@ -2,8 +2,8 @@
 %define mydocs __tmp_docdir
 #
 Name:           rmol
-Version:        0.20.0
-Release:        3%{?dist}
+Version:        0.21.0
+Release:        2%{?dist}
 
 Summary:        C++ library of Revenue Management and Optimisation classes and functions
 
@@ -16,7 +16,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gsl-devel >= 1.8
 BuildRequires:  boost-devel >= 1.34
 BuildRequires:  cppunit-devel >= 1.10
-BuildRequires:  libicu
 #Requires:       
 
 %description
@@ -50,8 +49,14 @@ programs using %{name}, you will need to install %{name}-devel.
 %package doc
 Summary:        HTML documentation for the RMOL library
 Group:          Documentation
+%if 0%{?fedora} >= 10
 BuildArch:      noarch
-BuildRequires:  doxygen, texlive-latex, texlive-dvips, ghostscript
+BuildRequires:  texlive-latex, texlive-dvips
+%endif
+%if 0%{?fedora} < 10
+BuildRequires:  tetex-latex, tetex-dvips
+%endif
+BuildRequires:  doxygen, ghostscript
 
 %description doc
 This package contains the documentation in the HTML format of the RMOL
@@ -124,6 +129,12 @@ fi
 
 
 %changelog
+* Sat May 09 2009 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.21.0-2
+- Removed dependencies on specific versions (for EL 5)
+
+* Mon May 04 2009 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.21.0-1
+- Upstream integration
+
 * Sun May 03 2009 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.20.0-3
 - Added dependency on libicu for Boost 1.37 (Fedora 11)
 
diff --git a/sources b/sources
index cff0378..45ca580 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54a9a51ff3dc9a1990e924068c807304  rmol-0.20.0.tar.gz
+b3eb6a3515c1d42abd4fdcd156b4ddeb  rmol-0.21.0.tar.gz