diff --git a/.cvsignore b/.cvsignore
index f13a987..bbea763 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-BufferedMatrix_1.4.0.tar.gz
+BufferedMatrix_1.6.0.tar.gz
diff --git a/R-BufferedMatrix.spec b/R-BufferedMatrix.spec
index d96c3de..705be29 100644
--- a/R-BufferedMatrix.spec
+++ b/R-BufferedMatrix.spec
@@ -1,16 +1,16 @@
 %define packname   BufferedMatrix 
-%define bioc       2.2
+%define bioc       2.3
 
 Name:              R-%{packname}
-Version:           1.4.0
-Release:           3%{?dist}
+Version:           1.6.0
+Release:           1%{?dist}
 Summary:           A matrix data storage object method from bioconductor
 Summary(fr):       Stockage des données d'un matrice dans un fichier temporaire
 
 Group:             Applications/Engineering
 License:           LGPLv2+
-URL:               http://bioconductor.org/packages/2.2/bioc/html/BufferedMatrix.html
-Source0:           http://bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz 
+URL:               http://bioconductor.org/packages/release/bioc/html/BufferedMatrix.html
+Source0:           http://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz 
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    R-devel tetex-latex 
@@ -43,20 +43,22 @@ developing applications that use %{name}
 %build
 
 %install
-rm -rf %{buildroot}
+rm -rf %{buildroot}i
 sed -i -e 's/\r$//' %{packname}/inst/doc/BufferedMatrix.Rnw
 
-mkdir -p  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
-install -D %{packname}/inst/include/*  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
-chmod -x $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/*
-
 mkdir -p %{buildroot}%{_libdir}/R/library 
-R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library
+%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
 
+# Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf %{buildroot}%{_libdir}/R/library/R.css
 
-rm -rf %{buildroot}%{_libdir}/R/library/%{packname}/include/
+## Change the header of place for the -devel --> Removed 
+## see: https://www.redhat.com/archives/fedora-r-devel-list/2009-March/msg00001.html
+#mkdir -p  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
+#install -D %{packname}/inst/include/*  $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/
+#chmod -x $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/include/*
+#rm -rf %{buildroot}%{_libdir}/R/library/%{packname}/include/
 
 %check
 %{_bindir}/R CMD check %{packname}
@@ -89,10 +91,14 @@ rm -rf %{buildroot}
 
 %files		devel
 %defattr(-,root,root,-)
-%{_datadir}/R/library/%{packname}/
+%{_libdir}/R/library/%{packname}/
 
 
 %changelog
+* Sat Mar 21 2009 pingou <pingou@pingoured.fr> - 1.6.0-1
+- Update to Biocondutor 2.3
+- Put back the headers to libdir instead of moving them to datadir
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 68f0468..2ccdc98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8f909044a4a988a4e524d5baeada30a  BufferedMatrix_1.4.0.tar.gz
+271c40c97fd51495851d92f82b6bb9b6  BufferedMatrix_1.6.0.tar.gz