diff --git a/AUTHORS b/AUTHORS
index 2b22fa697..c62cc1b3b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,7 +8,7 @@ Copyright Laurent Gautier 2008-2010
 People have contributed suggestions or patches; they are thanked here,
 rpy2 is much better because of them.
 
-rpy2 is making a limited use of code from:
+rpy2 is making a limited use (if much left) of code from:
 
 RPy - http://rpy.sourceforge.net
 --------------------------------
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 57457089e..ed1da5786 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.1beta'
+release = '2.1rc'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/rpy/__init__.py b/rpy/__init__.py
index c9c22ad18..e6b75f1fe 100644
--- a/rpy/__init__.py
+++ b/rpy/__init__.py
@@ -1,4 +1,4 @@
-__version_vector__ = ((2,1,0), 'beta2')
+__version_vector__ = ((2,1,0), 'rc')
 
 __version__ = '.'.join([str(x) for x in __version_vector__[0]]) + \
               '' + __version_vector__[1]
diff --git a/rpy/robjects/__init__.py b/rpy/robjects/__init__.py
index 683e9ec48..e29ef379c 100644
--- a/rpy/robjects/__init__.py
+++ b/rpy/robjects/__init__.py
@@ -4,6 +4,8 @@
 The module is structured around the singleton r of class R,
 that represents an embedded R.
 
+License: GPLv3.0 (although a dual license can be worked out)
+
 """
 
 import os, sys
diff --git a/setup.py b/setup.py
index 7efa9c92f..08a917327 100755
--- a/setup.py
+++ b/setup.py
@@ -277,7 +277,7 @@ def getRinterface_ext():
     version = pack_version,
     description = "Python interface to the R language",
     url = "http://rpy.sourceforge.net",
-    license = "(L)GPL",
+    license = "GPLv3.0 (except rpy2.rinterface LGPL)",
     author = "Laurent Gautier",
     author_email = "lgautier@gmail.com",
     ext_modules = rinterface_exts[0],
@@ -293,9 +293,11 @@ def getRinterface_ext():
                 ],
     classifiers = ['Programming Language :: Python',
                    'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+                   'License :: OSI Approved :: GNU General Public License (GPL)
+',
                    'Intended Audience :: Developers',
                    'Intended Audience :: Science/Research',
-                   'Development Status :: 3 - Alpha'
+                   'Development Status :: 4 - Beta'
                    ],
     data_files = [(os.path.join('rpy2', 'images'), 
                    [os.path.join('doc', 'source', 'rpy2_logo.png')])]