diff --git a/setup.py b/setup.py
index da8dc8d..31210e9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 # {# pkglts, pysetup.kwds
 # format setup arguments
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 
 short_descr = "Multiscale Tree Graph datastructure and interfaces"
@@ -14,27 +14,27 @@
 
 
 # find version number in src/openalea/mtg/version.py
-version = {}
+_version = {}
 with open("src/openalea/mtg/version.py") as fp:
-    exec(fp.read(), version)
+    exec(fp.read(), _version)
 
-mtg_version = version["__version__"]
+version = _version["__version__"]
 
 setup_kwds = dict(
     name='openalea.mtg',
-    version=mtg_version,
+    version=version,
     description=short_descr,
     long_description=readme + '\n\n' + history,
     author="Christophe Pradal",
     author_email="christophe pradal __at__ cirad fr",
     url='http://github.com/openalea/mtg',
-    license='cecill-c',
+    license='CeCILL-C',
+    keywords=['OpenAlea', 'MTG', 'Plant Architecture', 'Tree Graph'],
     zip_safe=False,
 
-    packages=find_packages('src'),
+    packages=find_namespace_packages(where='src', include=['openalea', 'openalea.*']),
     package_dir={'': 'src'},
     entry_points={},
-    keywords='',
     )
 # #}
 # change setup_kwds below before the next pkglts tag
diff --git a/src/openalea/__init__.py b/src/openalea/__init__.py
deleted file mode 100644
index a9a6a7a..0000000
--- a/src/openalea/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# {#pkglts,
-__import__('pkg_resources').declare_namespace(__name__)
-# #}
diff --git a/src/openalea/mtg/version.py b/src/openalea/mtg/version.py
index b6478c7..15d5f2e 100644
--- a/src/openalea/mtg/version.py
+++ b/src/openalea/mtg/version.py
@@ -4,10 +4,10 @@
 major = 2
 """(int) Version major component."""
 
-minor = 1
+minor = 2
 """(int) Version minor component."""
 
-post = 2
+post = 0
 """(int) Version post or bugfix component."""
 
 __version__ = ".".join([str(s) for s in (major, minor, post)])