diff --git a/.cvsignore b/.cvsignore
index 88f3c13..e82b53b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-DynDoc_1.17.0.tar.gz
+DynDoc_1.18.0.tar.gz
diff --git a/R-DynDoc.spec b/R-DynDoc.spec
index fb2e0a9..7e15ef7 100644
--- a/R-DynDoc.spec
+++ b/R-DynDoc.spec
@@ -1,14 +1,15 @@
 %define packname  DynDoc
+%define bioc      2.2
 
 Name:             R-%{packname}
-Version:          1.17.0 
+Version:          1.18.0 
 Release:          1%{?dist}
 Summary:          Functions for dynamic documents
 
 Group:            Applications/Productivity
 License:          Artistic 2.0
 URL:              http://bioconductor.org/packages/bioc/html/DynDoc.html
-Source0:          http://bioconductor.org/packages/bioc/src/contrib/%{packname}_%{version}.tar.gz
+Source0:          http://www.bioconductor.org/packages/%{bioc}/bioc/src/contrib/%{packname}_%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
@@ -66,18 +67,26 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 
 
 %changelog
+* Fri May 02 2008 Pingou <pingoufc4@yahoo.fr> 1.18.0-1
+- Update to bioconductor 2.2
+
 * Mon Oct 08 2007 Pingou <pingoufc4@yahoo.fr> 1.17.0-1
 - Update to bioconductor 2.1
+
 * Wed Aug 29 2007 Pingou <pingoufc4@yahoo.fr> 1.14.0-5
 -Change the license tag
+
 * Fri Jul 13 2007 Pingou <pingoufc4@yahoo.fr> 1.14.0-4
 - Change in the BR and R to fit the guidelines
+
 * Tue Jul 10 2007 Pingou <pingoufc4@yahoo.fr> 1.14.0-3
 - Change _libdir to _datadir as it is a noarch package
 - Change in the files section to mark the folder
 - Change in the post and postun section to fit with the packaging guidelines
 - Change in the prep section to fit with the packaging guidelines
+
 * Wed May 23 2007 Pingou <pingoufc4@yahoo.fr> 1.14.0-2
 - Submitting to Fedora Extras
+
 * Wed May 23 2007 Tom "spot" Callaway <tcallawa@redhat.com> 1.14.0-1
 - initial package for Fedora
diff --git a/sources b/sources
index 87f1a04..f69ae7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a867b072442685e646814e3bdd6ffe44  DynDoc_1.17.0.tar.gz
+9abd188a5b2706665140e8a8b6c07155  DynDoc_1.18.0.tar.gz